diff options
| author | Mike Frysinger | 2012-10-20 15:01:26 -0400 |
|---|---|---|
| committer | Mike Frysinger | 2012-10-20 15:01:26 -0400 |
| commit | 5694afd72a0a424fcdd2ac85838229a1a86b7e84 (patch) | |
| tree | 3b27a52db41b6774102953038d1cc809244d66f3 | |
| parent | 67dc7b21cae44627d0ee55aedb90e421f58ac9c9 (diff) | |
| download | busybox-5694afd72a0a424fcdd2ac85838229a1a86b7e84.zip busybox-5694afd72a0a424fcdd2ac85838229a1a86b7e84.tar.gz | |
build system: use pkg-config to look up selinux libs
Newer versions of libselinux has started linking against more libs.
Rather than continuing hardcoding things, switch to using pkg-config
to query for its dependencies.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | Makefile.flags | 12 |
2 files changed, 12 insertions, 1 deletions
@@ -297,6 +297,7 @@ NM = $(CROSS_COMPILE)nm STRIP = $(CROSS_COMPILE)strip OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump +PKG_CONFIG ?= $(CROSS_COMPILE)pkg-config AWK = awk GENKSYMS = scripts/genksyms/genksyms DEPMOD = /sbin/depmod diff --git a/Makefile.flags b/Makefile.flags index e77c0e5..307afa7 100644 --- a/Makefile.flags +++ b/Makefile.flags @@ -78,6 +78,12 @@ ARCH_FPIC ?= -fpic ARCH_FPIE ?= -fpie ARCH_PIE ?= -pie +# Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES)) +define pkg_check_modules +$(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2)) +$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2)) +endef + ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y) # on i386: 14% smaller libbusybox.so # (code itself is 9% bigger, we save on relocs/PLT/GOT) @@ -89,6 +95,7 @@ endif ifeq ($(CONFIG_STATIC),y) CFLAGS_busybox += -static +PKG_CONFIG_FLAGS += --static endif ifeq ($(CONFIG_PIE),y) @@ -131,7 +138,10 @@ LDLIBS += pam pam_misc pthread endif ifeq ($(CONFIG_SELINUX),y) -LDLIBS += selinux sepol +SELINUX_PC_MODULES = libselinux libsepol +$(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES))) +CPPFLAGS += $(SELINUX_CFLAGS) +LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%)) endif ifeq ($(CONFIG_EFENCE),y) |