Переглянути джерело

ibrdtn-tools: Disable dependency on libdaemon library

Since the current release of the package does not provide a
configure option to disable this dependency, a patch is necessary
to add this option.

Signed-off-by: Johannes Morgenroth <morgenroth@ibr.cs.tu-bs.de>
Johannes Morgenroth 10 роки тому
джерело
коміт
b9a646bd87

+ 3
- 0
net/ibrdtn-tools/Makefile Переглянути файл

@@ -33,6 +33,9 @@ define Package/ibrdtn-tools/description
33 33
  and a tools to ping a DTN node (dtnping).
34 34
 endef
35 35
 
36
+CONFIGURE_ARGS += \
37
+	--without-libdaemon
38
+
36 39
 define Package/ibrdtn-tools/install
37 40
 	$(INSTALL_DIR) $(1)/usr/bin/
38 41
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtnping $(1)/usr/bin/dtnping

+ 89
- 0
net/ibrdtn-tools/patches/100-add_configure_options.patch Переглянути файл

@@ -0,0 +1,89 @@
1
+--- a/configure.ac
2
++++ b/configure.ac
3
+@@ -67,34 +67,57 @@ AC_TYPE_UINT8_T
4
+ AC_FUNC_MALLOC
5
+ AC_CHECK_FUNCS([memset])
6
+ 
7
+-PKG_CHECK_MODULES(DAEMON, libdaemon >= 0.12, [
8
+-	AC_SUBST(DAEMON_CFLAGS)
9
+-	AC_SUBST(DAEMON_LIBS)
10
+-	AC_DEFINE(HAVE_LIBDAEMON, [1], ["daemon library is available"])
11
+-	AC_CHECK_LIB(daemon, daemon_reset_sigs, [
12
+-		AC_DEFINE(HAVE_DAEMON_RESET_SIGS, [1], ["daemon library has daemon_reset_sigs() and daemon_unblock_sigs() functions"])
13
+-	])
14
+-], [
15
+-	AC_MSG_WARN([daemon library not found, daemonize features disabled])
16
+-])
17
++AC_ARG_WITH([libdaemon],
18
++	AS_HELP_STRING([--without-libdaemon], [Build without daemonize support]),
19
++	[
20
++		AC_MSG_NOTICE([daemonize support disabled])
21
++	], [
22
++		PKG_CHECK_MODULES(DAEMON, libdaemon >= 0.12, [
23
++			AC_SUBST(DAEMON_CFLAGS)
24
++			AC_SUBST(DAEMON_LIBS)
25
++			AC_DEFINE(HAVE_LIBDAEMON, [1], ["daemon library is available"])
26
++			AC_CHECK_LIB(daemon, daemon_reset_sigs, [
27
++				AC_DEFINE(HAVE_DAEMON_RESET_SIGS, [1], ["daemon library has daemon_reset_sigs() and daemon_unblock_sigs() functions"])
28
++			])
29
++		], [
30
++			AC_MSG_WARN([daemon library not found, daemonize features disabled])
31
++		])
32
++	]
33
++)
34
+ 
35
+-PKG_CHECK_MODULES(ARCHIVE, libarchive >= 3.0, [
36
+-	AC_SUBST(ARCHIVE_CFLAGS)
37
+-	AC_SUBST(ARCHIVE_LIBS)
38
+-	AC_DEFINE(HAVE_LIBARCHIVE, [1], ["libarchive is available"])
39
+-		has_libarchive="yes"
40
+-], [
41
+-	AC_MSG_WARN([libarchive not found, dtninbox and dtnoutbox will not be compiled])
42
+-])
43
++AC_ARG_WITH([libarchive],
44
++	AS_HELP_STRING([--without-libarchive], [Build without archive support]),
45
++	[
46
++		has_libarchive="no"
47
++		AC_MSG_NOTICE([archive support disabled, dtninbox and dtnoutbox will not be compiled])
48
++	], [
49
++		PKG_CHECK_MODULES(ARCHIVE, libarchive >= 3.0, [
50
++			AC_SUBST(ARCHIVE_CFLAGS)
51
++			AC_SUBST(ARCHIVE_LIBS)
52
++			AC_DEFINE(HAVE_LIBARCHIVE, [1], ["libarchive is available"])
53
++				has_libarchive="yes"
54
++		], [
55
++			AC_MSG_WARN([libarchive not found, dtninbox and dtnoutbox will not be compiled])
56
++		])
57
++	]
58
++)
59
+ 
60
+-PKG_CHECK_MODULES(OPENSSL, openssl, [
61
+-	AC_SUBST(OPENSSL_CFLAGS)
62
+-	AC_SUBST(OPENSSL_LIBS)
63
+-	AC_DEFINE(HAVE_OPENSSL, [1], ["openssl available"])
64
+-		has_openssl="yes"
65
+-], [
66
+-	AC_MSG_WARN([openssl not found, dtninbox and dtnoutbox will not be compiled])
67
+-])
68
++AC_ARG_WITH([openssl],
69
++	AS_HELP_STRING([--without-openssl], [Build without openssl support]),
70
++	[
71
++		has_openssl="no"
72
++		AC_MSG_NOTICE([openssl support disabled, dtninbox and dtnoutbox will not be compiled])
73
++	], [
74
++		PKG_CHECK_MODULES(OPENSSL, openssl, [
75
++			AC_SUBST(OPENSSL_CFLAGS)
76
++			AC_SUBST(OPENSSL_LIBS)
77
++			AC_DEFINE(HAVE_OPENSSL, [1], ["openssl available"])
78
++				has_openssl="yes"
79
++		], [
80
++			AC_MSG_WARN([openssl not found, dtninbox and dtnoutbox will not be compiled])
81
++		])
82
++	]
83
++)
84
+ 
85
+ AC_ARG_WITH([tffs],
86
+ AS_HELP_STRING([--with-tffs=PATH], [set the tffs path for fat-image support in dtnoutbox]), [
87
+-- 
88
+1.9.1
89
+