Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -0,0 +1,32 @@
|
||||
From 4fc9a348026a945aec8eddffc7613de9cb10b10c Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sun, 7 Aug 2016 11:08:26 +0200
|
||||
Subject: [PATCH] ps/output.c: include <dlfcn.h> only when necessary
|
||||
|
||||
dlopen() functionality is only used when SELinux support is enabled, so
|
||||
<dlfcn.h> only needs to be included when ENABLE_LIBSELINUX is
|
||||
defined. This fixes the build in configurations where <dlfcn.h> is not
|
||||
available.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
ps/output.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/ps/output.c b/ps/output.c
|
||||
index 42c04cf..f540832 100644
|
||||
--- a/ps/output.c
|
||||
+++ b/ps/output.c
|
||||
@@ -46,7 +46,9 @@
|
||||
*/
|
||||
|
||||
#include <ctype.h>
|
||||
+#if ENABLE_LIBSELINUX
|
||||
#include <dlfcn.h>
|
||||
+#endif
|
||||
#include <fcntl.h>
|
||||
#include <grp.h>
|
||||
#include <limits.h>
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
config BR2_PACKAGE_PROCPS_NG
|
||||
bool "procps-ng"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||
help
|
||||
|
||||
@@ -35,7 +35,11 @@ endif
|
||||
|
||||
# Make sure binaries get installed in /bin, so that they overwrite
|
||||
# their busybox counterparts.
|
||||
PROCPS_NG_CONF_OPTS += --exec-prefix=/
|
||||
# Make sure libprocps.pc is installed in STAGING_DIR/usr/lib/pkgconfig/
|
||||
# otherwise it's installed in STAGING_DIR/lib/pkgconfig/ breaking
|
||||
# pkg-config --libs libprocps.
|
||||
PROCPS_NG_CONF_OPTS += --exec-prefix=/ \
|
||||
--libdir=/usr/lib
|
||||
|
||||
# Allows unicode characters to show in 'watch'
|
||||
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
|
||||
@@ -43,4 +47,10 @@ PROCPS_NG_CONF_OPTS += \
|
||||
--enable-watch8bit
|
||||
endif
|
||||
|
||||
# numa support requires libdl, so explicitly disable it when
|
||||
# BR2_STATIC_LIBS=y
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
PROCPS_NG_CONF_OPTS += --disable-numa
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user