package/syslog-ng: add optional support for libcap

When libcap was compiled before, syslog-ng will use it as optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/sbin/syslog-ng | grep NEEDED | sort
 0x0000000000000001 (NEEDED)             Shared library: [libcap.so.2]
[...]

---
 package/syslog-ng/syslog-ng.mk | 7 +++++++
 1 file changed, 7 insertions(+)

index 5f48a79..54593e4 100644
@@ -20,6 +20,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 SYSLOG_NG_DEPENDENCIES += busybox
 endif
 
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+SYSLOG_NG_DEPENDENCIES += libcap
+SYSLOG_NG_CONF_OPTS += --enable-linux-caps
+else
+SYSLOG_NG_CONF_OPTS += --disable-linux-caps
+endif
+
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 SYSLOG_NG_DEPENDENCIES += python
 SYSLOG_NG_CONF_OPTS += \

2.7.0

When libuuid was compiled before, syslog-ng will use it as optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/libsyslog-ng-3.7.so.0.0.0 | grep NEEDED | sort
[...]
 0x0000000000000001 (NEEDED)             Shared library: [libuuid.so.1]

The build system offers no option to en-/disable libuuid support:
https://github.com/balabit/syslog-ng/blob/master/configure.ac#L1291

---
 package/syslog-ng/syslog-ng.mk | 4 ++++
 1 file changed, 4 insertions(+)

index 54593e4..f11d895 100644
@@ -58,6 +58,10 @@ else
 SYSLOG_NG_CONF_OPTS += --disable-json
 endif
 
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
+SYSLOG_NG_DEPENDENCIES += util-linux
+endif
+
 ifeq ($(BR2_INIT_SYSTEMD),y)
 SYSLOG_NG_DEPENDENCIES += systemd
 SYSLOG_NG_CONF_OPTS += \

2.7.0

When geoip was compiled before, syslog-ng will use it as optional dependency:

$ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/lib/syslog-ng/libgeoip-plugin.so | grep NEEDED | sort
 0x0000000000000001 (NEEDED)             Shared library: [ld64-uClibc.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libc.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libGeoIP.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libpthread.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [librt.so.1]
 0x0000000000000001 (NEEDED)             Shared library: [libsyslog-ng-3.7.so.0]

---
 package/syslog-ng/syslog-ng.mk | 7 +++++++
 1 file changed, 7 insertions(+)

index f11d895..1acaad8 100644
@@ -20,6 +20,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 SYSLOG_NG_DEPENDENCIES += busybox
 endif
 
+ifeq ($(BR2_PACKAGE_GEOIP),y)
+SYSLOG_NG_DEPENDENCIES += geoip
+SYSLOG_NG_CONF_OPTS += --enable-geoip
+else
+SYSLOG_NG_CONF_OPTS += --disable-geoip
+endif
+
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
 SYSLOG_NG_DEPENDENCIES += libcap
 SYSLOG_NG_CONF_OPTS += --enable-linux-caps

2.7.0

Dear Bernd Kuhls,

All three patches applied to master, thanks.

Thomas

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com