Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/3] package/syslog-ng: add optional support for libcap
@ 2016-02-20 19:51 Bernd Kuhls
  2016-02-20 19:51 ` [Buildroot] [PATCH 2/3] package/syslog-ng: add optional support for libuuid from util-linux Bernd Kuhls
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Bernd Kuhls @ 2016-02-20 19:51 UTC (permalink / raw)
  To: buildroot

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]
[...]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/syslog-ng/syslog-ng.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk
index 5f48a79..54593e4 100644
--- a/package/syslog-ng/syslog-ng.mk
+++ b/package/syslog-ng/syslog-ng.mk
@@ -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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 2/3] package/syslog-ng: add optional support for libuuid from util-linux
  2016-02-20 19:51 [Buildroot] [PATCH 1/3] package/syslog-ng: add optional support for libcap Bernd Kuhls
@ 2016-02-20 19:51 ` Bernd Kuhls
  2016-02-20 19:51 ` [Buildroot] [PATCH 3/3] package/syslog-ng: add optional support for geoip Bernd Kuhls
  2016-02-21 14:02 ` [Buildroot] [PATCH 1/3] package/syslog-ng: add optional support for libcap Thomas Petazzoni
  2 siblings, 0 replies; 4+ messages in thread
From: Bernd Kuhls @ 2016-02-20 19:51 UTC (permalink / raw)
  To: buildroot

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

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/syslog-ng/syslog-ng.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk
index 54593e4..f11d895 100644
--- a/package/syslog-ng/syslog-ng.mk
+++ b/package/syslog-ng/syslog-ng.mk
@@ -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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 3/3] package/syslog-ng: add optional support for geoip
  2016-02-20 19:51 [Buildroot] [PATCH 1/3] package/syslog-ng: add optional support for libcap Bernd Kuhls
  2016-02-20 19:51 ` [Buildroot] [PATCH 2/3] package/syslog-ng: add optional support for libuuid from util-linux Bernd Kuhls
@ 2016-02-20 19:51 ` Bernd Kuhls
  2016-02-21 14:02 ` [Buildroot] [PATCH 1/3] package/syslog-ng: add optional support for libcap Thomas Petazzoni
  2 siblings, 0 replies; 4+ messages in thread
From: Bernd Kuhls @ 2016-02-20 19:51 UTC (permalink / raw)
  To: buildroot

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]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/syslog-ng/syslog-ng.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk
index f11d895..1acaad8 100644
--- a/package/syslog-ng/syslog-ng.mk
+++ b/package/syslog-ng/syslog-ng.mk
@@ -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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 1/3] package/syslog-ng: add optional support for libcap
  2016-02-20 19:51 [Buildroot] [PATCH 1/3] package/syslog-ng: add optional support for libcap Bernd Kuhls
  2016-02-20 19:51 ` [Buildroot] [PATCH 2/3] package/syslog-ng: add optional support for libuuid from util-linux Bernd Kuhls
  2016-02-20 19:51 ` [Buildroot] [PATCH 3/3] package/syslog-ng: add optional support for geoip Bernd Kuhls
@ 2016-02-21 14:02 ` Thomas Petazzoni
  2 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2016-02-21 14:02 UTC (permalink / raw)
  To: buildroot

Dear Bernd Kuhls,

On Sat, 20 Feb 2016 20:51:15 +0100, Bernd Kuhls wrote:
> 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]
> [...]
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/syslog-ng/syslog-ng.mk | 7 +++++++
>  1 file changed, 7 insertions(+)

All three patches applied to master, thanks.

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-02-21 14:02 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-20 19:51 [Buildroot] [PATCH 1/3] package/syslog-ng: add optional support for libcap Bernd Kuhls
2016-02-20 19:51 ` [Buildroot] [PATCH 2/3] package/syslog-ng: add optional support for libuuid from util-linux Bernd Kuhls
2016-02-20 19:51 ` [Buildroot] [PATCH 3/3] package/syslog-ng: add optional support for geoip Bernd Kuhls
2016-02-21 14:02 ` [Buildroot] [PATCH 1/3] package/syslog-ng: add optional support for libcap Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox