aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-06-25 12:58:31 -0700
committerGregory M. Tuner <gmt@be-evil.net>2014-06-25 12:58:31 -0700
commit57ba6691ec08742b329778ec90dcb2b45e0b0bb3 (patch)
treecd5b0223ee88a93e550d16cd273f004863a9aefc
parentDrop sys-libs/libcap (diff)
downloadgmt-57ba6691ec08742b329778ec90dcb2b45e0b0bb3.zip
gmt-57ba6691ec08742b329778ec90dcb2b45e0b0bb3.tar.gz
gmt-57ba6691ec08742b329778ec90dcb2b45e0b0bb3.tar.bz2
sys-libs/libcap-ng: fix broken multilib python header finding
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
-rw-r--r--sys-libs/libcap-ng/Manifest2
-rw-r--r--sys-libs/libcap-ng/libcap-ng-0.7.4-r1.ebuild43
2 files changed, 25 insertions, 20 deletions
diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index 1c609b5..4929651 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -1,6 +1,6 @@
DIST libcap-ng-0.7.3.tar.gz 392613 SHA256 5ca441c8d3a1e4cfe8a8151907977662679457311ccaa7eaac91447c33a35bb1 SHA512 f03a35c54b5998ef2e712540caa1f4ade37f9abe60992a1e727142b26815a4b8a7ce86ea94466fe692e4798c7297e5e1bbd338e5afe05689905ee9e0c0f16ef2 WHIRLPOOL 7752a70ea348dfc52537f67d5dccab03d598a112a7263a8811987453b53cda58643e938b4651c5cd8d0ea02f20fddc10bff2ac8bc23f68f97c9ab8c5791429ab
DIST libcap-ng-0.7.4.tar.gz 407007 SHA256 48a2083276f9820cb92dcb05d001b30733bcbf48c14c230303cac3cd08b45b6b SHA512 443b92f44cffd4b436a2651eb3539c560382102d918faf63f993d3b6627c03e80f7b4a5105ddb040890ef82122a42ca6881795ab0639de337f693705f5506cf0 WHIRLPOOL 3d62f26fad8c9e7756374022982a4f2fcdde5af5532474dfa7eb6ba1bc7f97984691bdda8975ef32423b8e86af2462ef672ba3175a3121a484c46096cc8f10b2
EBUILD libcap-ng-0.7.3-r1.ebuild 2709 SHA256 498ef84decf54e33a00a31ea1366680ca2afbe1be889262a9173316cd276d1f0 SHA512 465f7d405a1c35970a075ea68605c4aeb58b7bdad301cbdaad18dc59559a6986aa2ff3efca496a86a3a6aa368cd289792d566b96e533e79b9805cf8066f3a018 WHIRLPOOL 86a321ac2d3a5d5c0590b06c56a2a1e6267a79f56c761aadfcac77f1075416b0fce7820b219c6e5ac9c2f5c44c7c51febac27c1ed56b0f3f02d7626d809af717
-EBUILD libcap-ng-0.7.4-r1.ebuild 2032 SHA256 e8fcb1f97aedd3285a0d5ef41d2eae09d6b4642802146114f19df3c8213858b3 SHA512 8afd92266438c534f0df5312aae32f9b4f0793b7192342721f893eab6724644da8eac2d5d4642f08652d3589ac2384480d3089f8f198802447bbec0764256f3d WHIRLPOOL 08832c73c83b3ce79bcb22b31a79747222cf6f4647bf8888f04d32a7483bd2198a9ca51643f1ad28a5fee8fd460ee114278547f7092aaa4695231478cee2eaac
+EBUILD libcap-ng-0.7.4-r1.ebuild 2320 SHA256 b822f18fb7cb036525dee7a35bb4aa3ae2f9f23726c66ea65f2c9f23f7bebd83 SHA512 93791f3dc57d6457f9766a3c0212028db265a320bbf440906a2b80ed823ee5a80ed592fe92f0a371ba1c684dcba6c943166e49250e9ed19c28db0872ee4245bd WHIRLPOOL dab6e4de59b0bcd7d74e72e7be7057831734ae1d655f52ed2fef30578b01a9d1e1b1511a01c2f7099fa6e641d31b3aff126d4bfdf202836afa12baa9c7d24ae2
MISC ChangeLog 8620 SHA256 cd5f353327e863f251560dc1f04fbd9cd13a02a0279df434d0cf580177e24a3c SHA512 00b0a157a597d2cff30574cb4c9b97ab04719c752f3c6c2bfdf94f858d41f717fb49c7d3bbc0d80c2353e545488f6d6ea9e51c54f49130f3ccf016756be0c25c WHIRLPOOL dc52bf8d0f9e9affe34b70f7d80070db8ca13b899b2d96e97ff3d2a45adc74895782f2f42463b522e092598f06f7a505e7d837193dd093c630de695087671735
MISC metadata.xml 501 SHA256 2ba6118979e987255eff0de2453eff6e9a76d4e2ffa04e3acbe1bc92fda0a171 SHA512 f974d0009e90640257cab704897db67cc736663313d026ba2092a6aaae004973416e1f649c9d7a0373b1f58d49db8103217e85803faa8c37a7830c9057f2c5e8 WHIRLPOOL 38c2e18fffda49e0b81e47bce317af92b0e992d1371c79e2e8bed04ea69e704902e005af8693735f7bf1fbf8d1cda5bea6ec9e0c20886018103914d11a95ec30
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.4-r1.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.4-r1.ebuild
index f7d9a45..5ba1674 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.4-r1.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.4-r1.ebuild
@@ -32,24 +32,29 @@ src_prepare() {
use sparc && replace-flags -O? -O0
}
-src_configure() {
+_py_wrap() {
+ local CFLAGS="${CFLAGS} $(python_get_CFLAGS)"
+ local CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)"
+ "$@"
+}
+
+multilib_src_configure() {
+ # set up the library build
local myeconfargs=(
--without-python
)
-
- # set up the library build
- autotools-multilib_src_configure
-
- if use python; then
+ autotools-utils_src_configure
+ if multilib_is_native_abi && use python; then
python_parallel_foreach_impl \
- autotools-utils_src_configure --with-python
+ _py_wrap \
+ autotools-utils_src_configure --with-python
fi
}
-src_compile() {
- autotools-multilib_src_compile
+multilib_src_compile() {
+ autotools-utils_src_compile
- if use python; then
+ if multilib_is_native_abi && use python; then
python_compile() {
local CFLAGS=${CFLAGS}
@@ -60,32 +65,32 @@ src_compile() {
}
# help build system find the right objects
- python_foreach_impl python_compile \
+ python_foreach_impl _py_wrap python_compile \
VPATH="${BUILD_DIR}"/bindings/python \
LIBS="${BUILD_DIR}"/src/libcap-ng.la
fi
}
-src_test() {
+multilib_src_test() {
if [[ "${EUID}" -eq 0 ]]; then
ewarn "Skipping tests due to root permissions."
return
fi
- autotools-multilib_src_test
+ autotools-utils_src_test
- if use python; then
- python_foreach_impl \
+ if multilib_is_native_abi && use python; then
+ python_foreach_impl _py_wrap \
autotools-utils_src_compile -C bindings/python check \
VPATH="${BUILD_DIR}"/bindings/python:"${S}"/bindings/python/test
fi
}
-src_install() {
- autotools-multilib_src_install
+multilib_src_install() {
+ autotools-utils_src_install
- if use python; then
- python_foreach_impl \
+ if multilib_is_native_abi && use python; then
+ python_foreach_impl _py_wrap \
autotools-utils_src_install -C bindings/python \
VPATH="${BUILD_DIR}"/bindings/python
fi