diff options
author | Mike Frysinger <vapier@gentoo.org> | 2012-10-20 15:01:26 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2012-10-20 15:01:26 -0400 |
commit | 5694afd72a0a424fcdd2ac85838229a1a86b7e84 (patch) | |
tree | 3b27a52db41b6774102953038d1cc809244d66f3 /Makefile.flags | |
parent | 67dc7b21cae44627d0ee55aedb90e421f58ac9c9 (diff) | |
download | busybox-w32-5694afd72a0a424fcdd2ac85838229a1a86b7e84.tar.gz busybox-w32-5694afd72a0a424fcdd2ac85838229a1a86b7e84.tar.bz2 busybox-w32-5694afd72a0a424fcdd2ac85838229a1a86b7e84.zip |
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>
Diffstat (limited to '')
-rw-r--r-- | Makefile.flags | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Makefile.flags b/Makefile.flags index e77c0e527..307afa7f5 100644 --- a/Makefile.flags +++ b/Makefile.flags | |||
@@ -78,6 +78,12 @@ ARCH_FPIC ?= -fpic | |||
78 | ARCH_FPIE ?= -fpie | 78 | ARCH_FPIE ?= -fpie |
79 | ARCH_PIE ?= -pie | 79 | ARCH_PIE ?= -pie |
80 | 80 | ||
81 | # Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES)) | ||
82 | define pkg_check_modules | ||
83 | $(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2)) | ||
84 | $(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2)) | ||
85 | endef | ||
86 | |||
81 | ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y) | 87 | ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y) |
82 | # on i386: 14% smaller libbusybox.so | 88 | # on i386: 14% smaller libbusybox.so |
83 | # (code itself is 9% bigger, we save on relocs/PLT/GOT) | 89 | # (code itself is 9% bigger, we save on relocs/PLT/GOT) |
@@ -89,6 +95,7 @@ endif | |||
89 | 95 | ||
90 | ifeq ($(CONFIG_STATIC),y) | 96 | ifeq ($(CONFIG_STATIC),y) |
91 | CFLAGS_busybox += -static | 97 | CFLAGS_busybox += -static |
98 | PKG_CONFIG_FLAGS += --static | ||
92 | endif | 99 | endif |
93 | 100 | ||
94 | ifeq ($(CONFIG_PIE),y) | 101 | ifeq ($(CONFIG_PIE),y) |
@@ -131,7 +138,10 @@ LDLIBS += pam pam_misc pthread | |||
131 | endif | 138 | endif |
132 | 139 | ||
133 | ifeq ($(CONFIG_SELINUX),y) | 140 | ifeq ($(CONFIG_SELINUX),y) |
134 | LDLIBS += selinux sepol | 141 | SELINUX_PC_MODULES = libselinux libsepol |
142 | $(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES))) | ||
143 | CPPFLAGS += $(SELINUX_CFLAGS) | ||
144 | LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%)) | ||
135 | endif | 145 | endif |
136 | 146 | ||
137 | ifeq ($(CONFIG_EFENCE),y) | 147 | ifeq ($(CONFIG_EFENCE),y) |