summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-03-30 17:56:57 -0400
committerMike Frysinger <vapier@gentoo.org>2016-03-30 18:34:33 -0400
commit838c3028555eb9d8f12017dcf43f0c7b0c8af90f (patch)
tree00d3eda6d5617ef96ac1fac3c65fccf4a6824baf /sys-libs/libcap
parentwww-client/google-chrome-beta: automated update (diff)
downloadgentoo-838c3028555eb9d8f12017dcf43f0c7b0c8af90f.tar.gz
gentoo-838c3028555eb9d8f12017dcf43f0c7b0c8af90f.tar.bz2
gentoo-838c3028555eb9d8f12017dcf43f0c7b0c8af90f.zip
toolchain-funcs.eclass: gen_usr_ldscript: integrate multilib_is_native_abi support #479448
Many ebuilds have started checking multilib_is_native_abi to see if they should call gen_usr_ldscript. Since that logic always makes sense, add it directly to the gen_usr_ldscript function.
Diffstat (limited to 'sys-libs/libcap')
-rw-r--r--sys-libs/libcap/libcap-2.22-r2.ebuild2
-rw-r--r--sys-libs/libcap/libcap-2.24-r2.ebuild2
-rw-r--r--sys-libs/libcap/libcap-2.25.ebuild2
3 files changed, 3 insertions, 3 deletions
diff --git a/sys-libs/libcap/libcap-2.22-r2.ebuild b/sys-libs/libcap/libcap-2.22-r2.ebuild
index b5e8e317c1e8..6fb3f81b4483 100644
--- a/sys-libs/libcap/libcap-2.22-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.22-r2.ebuild
@@ -55,7 +55,7 @@ multilib_src_install() {
# no configure, needs explicit install line #444724#c3
emake install DESTDIR="${ED}"
- multilib_is_native_abi && gen_usr_ldscript -a cap
+ gen_usr_ldscript -a cap
rm -rf "${ED}"/usr/$(get_libdir)/security
if multilib_is_native_abi && use pam; then
diff --git a/sys-libs/libcap/libcap-2.24-r2.ebuild b/sys-libs/libcap/libcap-2.24-r2.ebuild
index 666d3b0ca076..e43d2e1c2974 100644
--- a/sys-libs/libcap/libcap-2.24-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.24-r2.ebuild
@@ -58,7 +58,7 @@ multilib_src_install() {
# no configure, needs explicit install line #444724#c3
emake install DESTDIR="${ED}"
- multilib_is_native_abi && gen_usr_ldscript -a cap
+ gen_usr_ldscript -a cap
use static-libs || rm "${ED}"/usr/$(get_libdir)/libcap.a
rm -rf "${ED}"/usr/$(get_libdir)/security
diff --git a/sys-libs/libcap/libcap-2.25.ebuild b/sys-libs/libcap/libcap-2.25.ebuild
index cb6045994283..fc4a23b24203 100644
--- a/sys-libs/libcap/libcap-2.25.ebuild
+++ b/sys-libs/libcap/libcap-2.25.ebuild
@@ -60,7 +60,7 @@ multilib_src_install() {
# no configure, needs explicit install line #444724#c3
emake install DESTDIR="${ED}"
- multilib_is_native_abi && gen_usr_ldscript -a cap
+ gen_usr_ldscript -a cap
use static-libs || rm "${ED}"/usr/$(get_libdir)/libcap.a
rm -rf "${ED}"/usr/$(get_libdir)/security