Refresh patches.
Debian Janitor
1 year, 6 months ago
| 4 | 4 |
Forwarded: not-needed
|
| 5 | 5 |
Updated: 2019-10-24
|
| 6 | 6 |
|
|
7 |
Index: entr.git/Makefile.kfreebsd
|
|
8 |
===================================================================
|
| 7 | 9 |
--- /dev/null
|
| 8 | |
+++ b/Makefile.kfreebsd
|
|
10 |
+++ entr.git/Makefile.kfreebsd
|
| 9 | 11 |
@@ -0,0 +1,6 @@
|
| 10 | 12 |
+PKG_CONFIG ?= pkg-config
|
| 11 | 13 |
+CFLAGS += -D_GNU_SOURCE $(shell $(PKG_CONFIG) --cflags libbsd-overlay)
|
|
| 13 | 15 |
+MANPREFIX ?= ${PREFIX}/share/man
|
| 14 | 16 |
+
|
| 15 | 17 |
+include Makefile.bsd
|
| 16 | |
--- a/configure
|
| 17 | |
+++ b/configure
|
| 18 | |
@@ -8,6 +8,7 @@
|
|
18 |
Index: entr.git/configure
|
|
19 |
===================================================================
|
|
20 |
--- entr.git.orig/configure
|
|
21 |
+++ entr.git/configure
|
|
22 |
@@ -8,6 +8,7 @@ copy_mk() {
|
| 19 | 23 |
case `uname` in
|
| 20 | 24 |
Darwin) copy_mk macos ;;
|
| 21 | 25 |
Linux) copy_mk linux ;;
|
| 4 | 4 |
Forwarded: not-needed
|
| 5 | 5 |
Updated: 2020-01-29
|
| 6 | 6 |
|
| 7 | |
--- a/Makefile.linux
|
| 8 | |
+++ b/Makefile.linux
|
|
7 |
Index: entr.git/Makefile.linux
|
|
8 |
===================================================================
|
|
9 |
--- entr.git.orig/Makefile.linux
|
|
10 |
+++ entr.git/Makefile.linux
|
| 9 | 11 |
@@ -1,5 +1,7 @@
|
| 10 | 12 |
-CPPFLAGS += -D_GNU_SOURCE -D_LINUX_PORT -Imissing
|
| 11 | 13 |
+PKG_CONFIG ?= pkg-config
|
|
| 16 | 18 |
+EXTRA_SRC = missing/kqueue_inotify.c
|
| 17 | 19 |
|
| 18 | 20 |
include Makefile.bsd
|
| 19 | |
--- a/missing/compat.h
|
| 20 | |
+++ b/missing/compat.h
|
|
21 |
Index: entr.git/missing/compat.h
|
|
22 |
===================================================================
|
|
23 |
--- entr.git.orig/missing/compat.h
|
|
24 |
+++ entr.git/missing/compat.h
|
| 21 | 25 |
@@ -4,7 +4,7 @@
|
| 22 | 26 |
#define NOTE_TRUNCATE 0
|
| 23 | 27 |
#endif
|
|
| 25 | 29 |
-#if defined(_LINUX_PORT) && defined(__GLIBC__)
|
| 26 | 30 |
+#if defined(_LINUX_PORT) && defined(__GLIBC__) && !defined(LIBBSD_OVERLAY)
|
| 27 | 31 |
#include <sys/types.h>
|
| 28 | |
size_t strlcpy(char *to, const char *from, int l);
|
|
32 |
size_t strlcpy(char *dst, const char *src, size_t dsize);
|
| 29 | 33 |
#endif
|