Use pkg-config to link against libselinux #436752 by Alphat-PC.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

4 files changed, 97 insertions, 4 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 9fa00aa0e9b6..be425a95398a 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.329 2012/10/05 18:03:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.330 2012/10/20 19:39:38 vapier Exp $
+
+  20 Oct 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/busybox-1.20.2-selinux-pkg-config.patch, busybox-1.20.2.ebuild:
+  Use pkg-config to link against libselinux #436752 by Alphat-PC.
 
   05 Oct 2012; Brent Baude <ranger@gentoo.org> busybox-1.20.2.ebuild:
   Marking busybox-1.20.2 ppc64 for bug 431948
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 18af263d5bae..efbcbf192832 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8
 AUX busybox-1.19.3-getty.patch 323 SHA256 6afda2e44b184a00dbffb5aac2c0e73b6fadbca24b2accbfac9c9ec8b56efe67 SHA512 ccb34bd7d929a20e01a1ecf45ca5c0378b1459c8d14c0a3d5ad731d0def71943e5d9169921f30d166dd1269fafeb00dbb6494e2a2d960e09239a29e6d6e03ee9 WHIRLPOOL 8ca140ad8d01753a060cf5b1fec70859729ed70a62bda5d9959085a6b27afed39c91f252e46fa98af5ef0e4f40e5a67d64056d3dd126ca07df9ed044a4ba8427
 AUX busybox-1.19.3-kernel-nfs.patch 3879 SHA256 c8f9aacfe7264a3585210fd1bca93c7cc9b2b99fcd847cf29097eccfd06a6980 SHA512 b9360f110808a841f2d7eb1ed3a08dc081af1a4a15e9038ba6f1262b4567e66f951460f59d7b18da30a9e8afc9ea048bae19b686c41b002c36259da4acada21c WHIRLPOOL 33ef6fd082a78d585bd43e7ba111548206a9ec2f6d3f49e5e8fe723fda9add99f8980c964ac6d25c3e51bf7a28d6d52fc1b02d345244c6650e87448b43cde895
@@ -8,6 +11,7 @@ AUX busybox-1.20.0-lineedit.patch 768 SHA256 f52874c75c2bf1ec5a101a1da111ec31fce
 AUX busybox-1.20.0-sed.patch 710 SHA256 4d0a7670848967afee436d0692d4395c61677cbef67c2c0d1f44f1878d2ebadd SHA512 e33437060b41ac9593f696ebf739945a7c1dc273c04a7777df97928562abc605df96c560800a96e8fa54a577fc29cc74a149144ff391792c2052ea8ae7790d19 WHIRLPOOL 564c3992c98ffaec93e7ac93a22739f45105429adbb0dc2be768a94d59fdade49616f5ef708f7705f0c4b190d846d1395132dcd6aba02ea8571194e63f94903c
 AUX busybox-1.20.0-udhcpc6-ipv6.patch 998 SHA256 58ac58c6d4e5d9d1d838d2e30f631b4b63a6187fd685d454294bee3646721d54 SHA512 4e506b1b8151aa5511a68c45fe95b7d8617738aed148ee60905fa4239c57d95b1b58cfa1d079be35411e5580936c5397eda34dba3a03290c788891b8cfdc6872 WHIRLPOOL 4cbd680815120425df0e2d955f8f79cf2d9ec516f7d360309feb7044a634408d79db4d967858a56669e9794e87cc8b7eea86597b89ed7507fbff1f21d79aaa61
 AUX busybox-1.20.2-glibc-sys-resource.patch 3054 SHA256 03d64c3b864fc5caa9ec56e3d2bf3bcd43801ee82e27332dbfe412138c9502d7 SHA512 c895d7ad0bf379b3ff1c4114af7f8fe0d53b1e60371ac1faaaf3434c293e125be4d79a6ee17d1aa2a923629b09416b833dd3408b9b4dabf56dd74d630c24e9ff WHIRLPOOL ff3e347035a4eb500762d59e35ff8cd2a91130de1c73b0666331f62fc19c586646fd713814e6712d53449d484fc2479ec0e5c29dfe3a19feb2163350a9171fac
+AUX busybox-1.20.2-selinux-pkg-config.patch 2009 SHA256 09d34cafa860cfabfb6911b087fa5887dd7f8b0026955654904fdb79d5281e76 SHA512 7b9b5cfc890d6c751727c6873df66ada967973786a2056a33e76663358aefe2d5828b366f6ce85b573bc01737426a1019dd2f0177caceef9dfac32904ee01d84 WHIRLPOOL fef2b477065ed309298788e35b82fd77d3297eb52eb59f065ebb9c631ec4a3f849ef99a014bdf682469ee1e8683debc312993faf1ad094e2f9afd8ce99c955aa
 AUX ginit.c 3091 SHA256 c5a4d5dedf402742611fea7607f0d870a918da06ed5ee98796371e158956ca80 SHA512 70afaa9e7eea9f72b30ad43cbb5e70c2105c735eca888836791c2f289274fcec16545134aca4d7ab3d750bdefe445d0586fc115a6060b509a2e77ed8d37f0f3f WHIRLPOOL 43e925d52d2f05b474834288f82777c481d84fe8904e0390e2f3298cbea55f671706fa79dbc7b570c6d700f53b23667dcec058e397a06b1b1979e350c19b3e9b
 AUX mdev-start.sh 2758 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 SHA512 532ececdf40769e8059172b95f600c92ddda9490dcf04dc76b11cd669b2b35740aeb02ef7c152a42c13d5adfefb391de01239ebbb4efd06faadc0d096fcde6f5 WHIRLPOOL aace77a07eedfea3ffab029ce25334ff58f512bf5c67512c1f4a40fd51278c2b8b764e55dbf975f74bb4423cfc3f35482a5d3ee8397032fcbf22ad1f91c7c4ea
 AUX mdev.rc 282 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5 SHA512 b3e5f0810a5e33047ea73c6a4d846087100fb8c566cfa001e07fc0c1448d2024913ac06355122076ec6c79146867af77a02bbc6509b009afa97b5207588da1b9 WHIRLPOOL 2bd20507d115c82076653c6c78899751f8e3b8cde14c81c8f10ef7747ccba867360b463c90b9b3053cd6cb8599f297362153ebbff0dfad90c2fac8f445668320
@@ -23,7 +27,24 @@ DIST busybox-1.20.2.tar.bz2 2186738 SHA256 eb13ff01dae5618ead2ef6f92ba879e9e0390
 EBUILD busybox-1.19.3-r1.ebuild 8449 SHA256 89497a117be3235619155c56984ada796850517d2e2583e4aefeebd02780822b SHA512 738cf1d3887471707815f8b3e22b5864ef16cfa1244f8b30cf7ccf5aa70a291484acacc3aa89cdca8be3cbbadb01fb767dd9f1a74566ebb30cdd15e30aee7935 WHIRLPOOL cfb0d1553813c7780589ba281b4a8216009adcec450843d4c2ab8e4fc39c2c5e0bac36f13743528c03ecc8c74503521b39e3a4e7db39bc1d37abe4fcf2526673
 EBUILD busybox-1.20.0.ebuild 8811 SHA256 19c606393839c21452f4352d6290495a27edddfc7b1d7fabff373da2d06a3dee SHA512 20c085027cea9ab62564f63eaf26f0ac205804ba2be6da02609dcd77c4adfa6dc6c08b56d7cb747d34938a3440bb27522a11515f50d71215f4bdca8d4c5ed04f WHIRLPOOL 822bf4e851f642d20a1786b53ca80cbeef86d2bee6d8775f395d87c254b66da991f1964c5f62e61f36d150566f0582e9c465e47285ad6315feb188435e6b5608
 EBUILD busybox-1.20.1.ebuild 8854 SHA256 6df4da6cff549e49babb76991fc9b0972b32a61e88906fc550a99e719dc861ed SHA512 72c291f76da4a018ee9b9a2a95150998afb2a5f26ad8125ac3b6e7f88c8a1aa7baf34908329aee6be7f8035041d42608d635efdbc7ec64dec901cc4b1ba7c41c WHIRLPOOL a63a743b92b9d4affa544dbe71005c0497bcf673a600c00b905043b6534dfed830cc225624e5f4c4b8166a3a7bc68f8b8ced1a90819f16943d0816278a63761b
-EBUILD busybox-1.20.2.ebuild 8995 SHA256 499c325a68c6fcf25191d0052cafc69d10c858d752e9220bf08ea64818362f74 SHA512 c17d6b6d463265b3926ba2df5a5a8d58293adc42dfc0b8d7b75c002c54d3acbdd1f624fc84233ef3235c2b1fb7e9bde35f34fd08b7af7cdc1d178fe9ade25f37 WHIRLPOOL 25baf0bb87ba75291c2218f47ccc4aa425b2b1210f9150734d88b60e98bac5171d069898d5c2eb5fae00dd05509f0bc23f37a445a77ace737304e6bf415626da
+EBUILD busybox-1.20.2.ebuild 9048 SHA256 24d8ca687474737f8fec0c5409b51eecabd41d6561acbef531752040cf498c6c SHA512 15e3edc06b257276f298fd659cedca7501022fad9697450b9204d82609848da27002ab105598a43d82244a28c697f3bb2db7ec0b31f163af1390c09078a39796 WHIRLPOOL e82b8b6c390cfa10a6c46e1fce432bb19bba00e515b3120a8c9eed6e18dd85c1d5bf3a447b795ef2caa34e937e74cab9885224acd13ff492d13223bd797037aa
 EBUILD busybox-9999.ebuild 8949 SHA256 ac29ef34aa4668cbcbcf8e18ad0cdc955f6fc9d1d0514fab51858150a1031279 SHA512 e90c03fb0013665cb037424dcc66d52ddad8481bc210b37e3ac2e471609793223e9b3f9cc9e8d5385e3fbf112db41d61b762d62ee2cfbc43219d47ffb9a46664 WHIRLPOOL 6ddb09cda1ba77368a0948bb060aeb7c2f052944101c748614e5da9ab9bb5829f1ab7405fd658e3d153fa9b49fdfa02c509b3660973b8b2fc88194d230c6bec7
-MISC ChangeLog 50438 SHA256 80154efc03d10e79b68488c8c3596f4108e5d366fe042cd4e85d13411cd96c6c SHA512 76885bd8d8584c31e752016657a2beb801dbb0daa820ed09864694a31b42d637bc56572b47b7be599aa7b3b6a3410423a9af63cb1732ed4026fb32461a36ec47 WHIRLPOOL 1bd9a284e17b51f27fae379fb1778e713ddc60b9fb7ded0fa6518b269276b475e2e3f24467e84cb5ec98f0c3e8afb60d91212255873302f7f57e7de2a1cfa3b3
+MISC ChangeLog 50628 SHA256 70c75d313e02fb0baa54966597925b90b667e6bd939c6f57811434b29f04f91d SHA512 0f12a4f8b7ed603c4c511290ecfbe9f7da15be185c1c9e8b895256eee13f6b1840d9738d0a0bab6209389a0601d50d770aae30d746f8e21f1c9881f2f4898ae1 WHIRLPOOL c30661e266089fb9ffb7942ca3e892be535788c1b3156c4567208cacd2a9c0d43afcf33561ec6e984c052d659b7f1b92ef25065b0c2161571106bac6bddc4d38
 MISC metadata.xml 590 SHA256 c850072634d2c534f1850c8a9082f861922d0df7ec73c5c2de48e5bcc12a85c6 SHA512 2b5fa6615e4ae3a0bfdcf612c0fe2fac41a474edf7ae7fca77f52ff5457f0e4716850b84c0c80c70abd2148422648c9057e5324051c60ae004e4c54d15e143f4 WHIRLPOOL b2d6c6223a3e7a9f6965b8d29aec6dc93bdba93e31cf72cdd367e492c70c9c2138fd83dbef1055ee203f61dc4b7bcf6704007f585285b1a5c5a034b72aeaeabe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQgv39AAoJELEHsLL7fEFWnbgP/0E2kEwaJ1bgafFU7M/cvWpQ
+C1l2Crd9BJ5lQRLQH+rn1rH2qpkpA0SnovWq71RMTgxMhI03ep2N+4syQ+ljF9iw
+6q+EBI65TokFD49tQ+zpCFslEVAEddB+yuuYqPtFh4DR4FjSM6rkt2xgoTWBATnh
+wBbyDx4R1s+15swATBqq++GgISAaISpJfChIxFvKap6RlGpdH/7TkRYFNlr2l9qP
+wfSBpLBnEq8rZSAMuCaZR6J4xL+udBORlaOyhYiY6D+E8WkXXZ4bp9r9pWtjtDG4
+sSm8BIYY2Tqjg1vZHFsGLauUMCz8uV2ozhuBQUzx+xvsHUNu98E7T7am14g+yY8i
+gWVLwXfd7xDyYjpaUfOY44Nh5gmZQKS6aNQ4ad70C1ahDgF45enw5ivGFIK4QewG
+T93K1WocSXn86c9GK5ulHfrY0gHgGaowIaAIWQvBSJkjSGN7BWnh25hwzuVSdxHR
+3pnf/HVpDPKv+h7TenJ1QRJP9p8JqL0PqYA0hffdInn1HgroGWRgjXOhkTn2wqhd
+xHr9kLB6uGEON+OV0XznBBJjfM8EZWtfxPZwc7NhSLTjdUV+DbJ2nOGlsrdULfyt
+XgFz4zqL6c3kyeuckYXZ7zr4lYU6DMw8Lab1eZTUa5T95cQV7YXHp6KeoxjSfosQ
+j+wZdnHZ+bWpPoLMWKGI
+=I7rW
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.20.2.ebuild b/sys-apps/busybox/busybox-1.20.2.ebuild
index d7db23597902..c355a70e9f73 100644
--- a/sys-apps/busybox/busybox-1.20.2.ebuild
+++ b/sys-apps/busybox/busybox-1.20.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.2.ebuild,v 1.10 2012/10/05 18:03:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.2.ebuild,v 1.11 2012/10/20 19:39:38 vapier Exp $
 
 EAPI="4"
 inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
@@ -103,6 +103,7 @@ src_prepare() {
 		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
 		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
 		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
 		Makefile || die
 	sed -i \
 		-e 's:-static-libgcc::' \
diff --git a/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch b/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch
new file mode 100644
index 000000000000..5e9ef26d056e
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch
@@ -0,0 +1,67 @@
+From 5694afd72a0a424fcdd2ac85838229a1a86b7e84 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 20 Oct 2012 15:01:26 -0400
+Subject: [PATCH] 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>
+---
+ Makefile       |  1 +
+ Makefile.flags | 12 +++++++++++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b2e9477..8995ff5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -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)
+-- 
+1.7.12
+