diff options
35 files changed, 39 insertions, 34 deletions
diff --git a/app-arch/xz-utils/xz-utils-5.0.8.ebuild b/app-arch/xz-utils/xz-utils-5.0.8.ebuild index d736bdbfc8b3..f3dbb5eec711 100644 --- a/app-arch/xz-utils/xz-utils-5.0.8.ebuild +++ b/app-arch/xz-utils/xz-utils-5.0.8.ebuild @@ -55,7 +55,7 @@ multilib_src_configure() { multilib_src_install() { default - multilib_is_native_abi && gen_usr_ldscript -a lzma + gen_usr_ldscript -a lzma } multilib_src_install_all() { diff --git a/app-arch/xz-utils/xz-utils-5.2.0.ebuild b/app-arch/xz-utils/xz-utils-5.2.0.ebuild index f73bba31ba1d..f50cda411d60 100644 --- a/app-arch/xz-utils/xz-utils-5.2.0.ebuild +++ b/app-arch/xz-utils/xz-utils-5.2.0.ebuild @@ -55,7 +55,7 @@ multilib_src_configure() { multilib_src_install() { default - multilib_is_native_abi && gen_usr_ldscript -a lzma + gen_usr_ldscript -a lzma } multilib_src_install_all() { diff --git a/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild b/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild index 7c2bae60b2a5..d50e82e1edb3 100644 --- a/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild +++ b/app-arch/xz-utils/xz-utils-5.2.1-r1.ebuild @@ -56,7 +56,7 @@ multilib_src_configure() { multilib_src_install() { default - multilib_is_native_abi && gen_usr_ldscript -a lzma + gen_usr_ldscript -a lzma } multilib_src_install_all() { diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild index 358098a8e7f5..7e69f3fdc5bd 100644 --- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild +++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild @@ -56,7 +56,7 @@ multilib_src_configure() { multilib_src_install() { default - multilib_is_native_abi && gen_usr_ldscript -a lzma + gen_usr_ldscript -a lzma } multilib_src_install_all() { diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild index da8e29b44d4d..ac40bc436608 100644 --- a/app-arch/xz-utils/xz-utils-9999.ebuild +++ b/app-arch/xz-utils/xz-utils-9999.ebuild @@ -56,7 +56,7 @@ multilib_src_configure() { multilib_src_install() { default - multilib_is_native_abi && gen_usr_ldscript -a lzma + gen_usr_ldscript -a lzma } multilib_src_install_all() { diff --git a/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild b/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild index b586c500c347..9d460643779e 100644 --- a/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild +++ b/dev-libs/libedit/libedit-20130611.3.1-r1.ebuild @@ -41,7 +41,7 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install - multilib_is_native_abi && gen_usr_ldscript -a edit + gen_usr_ldscript -a edit } multilib_src_install_all() { diff --git a/dev-libs/libedit/libedit-20130712.3.1.ebuild b/dev-libs/libedit/libedit-20130712.3.1.ebuild index 775c345b417b..50e38d623795 100644 --- a/dev-libs/libedit/libedit-20130712.3.1.ebuild +++ b/dev-libs/libedit/libedit-20130712.3.1.ebuild @@ -41,7 +41,7 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install - multilib_is_native_abi && gen_usr_ldscript -a edit + gen_usr_ldscript -a edit } multilib_src_install_all() { diff --git a/dev-libs/libpcre/libpcre-8.35.ebuild b/dev-libs/libpcre/libpcre-8.35.ebuild index 8e1311fac14b..633923385a2e 100644 --- a/dev-libs/libpcre/libpcre-8.35.ebuild +++ b/dev-libs/libpcre/libpcre-8.35.ebuild @@ -79,7 +79,7 @@ multilib_src_install() { DESTDIR="${D}" \ $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ install - multilib_is_native_abi && gen_usr_ldscript -a pcre + gen_usr_ldscript -a pcre } multilib_src_install_all() { diff --git a/dev-libs/libpcre/libpcre-8.36.ebuild b/dev-libs/libpcre/libpcre-8.36.ebuild index 2d8b251a5b5d..7cff23efbfc9 100644 --- a/dev-libs/libpcre/libpcre-8.36.ebuild +++ b/dev-libs/libpcre/libpcre-8.36.ebuild @@ -79,7 +79,7 @@ multilib_src_install() { DESTDIR="${D}" \ $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ install - multilib_is_native_abi && gen_usr_ldscript -a pcre + gen_usr_ldscript -a pcre } multilib_src_install_all() { diff --git a/dev-libs/libpcre/libpcre-8.37-r2.ebuild b/dev-libs/libpcre/libpcre-8.37-r2.ebuild index ab2cf486566a..4b098ab42c0f 100644 --- a/dev-libs/libpcre/libpcre-8.37-r2.ebuild +++ b/dev-libs/libpcre/libpcre-8.37-r2.ebuild @@ -77,7 +77,7 @@ multilib_src_install() { DESTDIR="${D}" \ $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ install - multilib_is_native_abi && gen_usr_ldscript -a pcre + gen_usr_ldscript -a pcre } multilib_src_install_all() { diff --git a/dev-libs/libpcre/libpcre-8.38.ebuild b/dev-libs/libpcre/libpcre-8.38.ebuild index b0b24a6ec9c4..fcda8d2e8812 100644 --- a/dev-libs/libpcre/libpcre-8.38.ebuild +++ b/dev-libs/libpcre/libpcre-8.38.ebuild @@ -75,7 +75,7 @@ multilib_src_install() { DESTDIR="${D}" \ $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \ install - multilib_is_native_abi && gen_usr_ldscript -a pcre + gen_usr_ldscript -a pcre } multilib_src_install_all() { diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild index 6253f87ec448..386d87a43d9d 100644 --- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild +++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild @@ -39,7 +39,7 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install - multilib_is_native_abi && gen_usr_ldscript -a usb + gen_usr_ldscript -a usb } multilib_src_install_all() { diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild index 4318c2f23107..39ddc74f99d9 100644 --- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild +++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild @@ -43,7 +43,7 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install - multilib_is_native_abi && gen_usr_ldscript -a usb + gen_usr_ldscript -a usb } multilib_src_install_all() { diff --git a/dev-libs/lzo/lzo-2.08-r1.ebuild b/dev-libs/lzo/lzo-2.08-r1.ebuild index 616c15716c88..f3cff4bce840 100644 --- a/dev-libs/lzo/lzo-2.08-r1.ebuild +++ b/dev-libs/lzo/lzo-2.08-r1.ebuild @@ -32,7 +32,7 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install - multilib_is_native_abi && gen_usr_ldscript -a lzo2 + gen_usr_ldscript -a lzo2 } multilib_src_install_all() { diff --git a/dev-libs/lzo/lzo-2.09.ebuild b/dev-libs/lzo/lzo-2.09.ebuild index 616c15716c88..f3cff4bce840 100644 --- a/dev-libs/lzo/lzo-2.09.ebuild +++ b/dev-libs/lzo/lzo-2.09.ebuild @@ -32,7 +32,7 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install - multilib_is_native_abi && gen_usr_ldscript -a lzo2 + gen_usr_ldscript -a lzo2 } multilib_src_install_all() { diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 59c28617aec4..cf95d04ad66c 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -722,6 +722,11 @@ gen_usr_ldscript() { tc-is-static-only && return + # We only care about stuffing / for the native ABI. #479448 + if [[ $(type -t multilib_is_native_abi) == "function" ]] ; then + multilib_is_native_abi || return 0 + fi + # Eventually we'd like to get rid of this func completely #417451 case ${CTARGET:-${CHOST}} in *-darwin*) ;; diff --git a/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild b/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild index 4b3aa4c8fc95..05974cf65637 100644 --- a/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild +++ b/net-libs/libtirpc/libtirpc-0.2.4-r2.ebuild @@ -43,7 +43,7 @@ multilib_src_install() { default # libtirpc replaces rpc support in glibc, so we need it in / - multilib_is_native_abi && gen_usr_ldscript -a tirpc + gen_usr_ldscript -a tirpc } multilib_src_install_all() { diff --git a/net-libs/libtirpc/libtirpc-0.2.5.ebuild b/net-libs/libtirpc/libtirpc-0.2.5.ebuild index 304b8d8f38d1..3af0dd70ac4b 100644 --- a/net-libs/libtirpc/libtirpc-0.2.5.ebuild +++ b/net-libs/libtirpc/libtirpc-0.2.5.ebuild @@ -47,7 +47,7 @@ multilib_src_install() { default # libtirpc replaces rpc support in glibc, so we need it in / - multilib_is_native_abi && gen_usr_ldscript -a tirpc + gen_usr_ldscript -a tirpc } multilib_src_install_all() { diff --git a/net-libs/libtirpc/libtirpc-0.3.1.ebuild b/net-libs/libtirpc/libtirpc-0.3.1.ebuild index dc5f6523132d..978e466c990a 100644 --- a/net-libs/libtirpc/libtirpc-0.3.1.ebuild +++ b/net-libs/libtirpc/libtirpc-0.3.1.ebuild @@ -43,7 +43,7 @@ multilib_src_install() { default # libtirpc replaces rpc support in glibc, so we need it in / - multilib_is_native_abi && gen_usr_ldscript -a tirpc + gen_usr_ldscript -a tirpc } multilib_src_install_all() { diff --git a/net-libs/libtirpc/libtirpc-1.0.1.ebuild b/net-libs/libtirpc/libtirpc-1.0.1.ebuild index 79ba2868ef71..2fd632bbad77 100644 --- a/net-libs/libtirpc/libtirpc-1.0.1.ebuild +++ b/net-libs/libtirpc/libtirpc-1.0.1.ebuild @@ -38,7 +38,7 @@ multilib_src_install() { default # libtirpc replaces rpc support in glibc, so we need it in / - multilib_is_native_abi && gen_usr_ldscript -a tirpc + gen_usr_ldscript -a tirpc } multilib_src_install_all() { diff --git a/sys-apps/acl/acl-2.2.52-r1.ebuild b/sys-apps/acl/acl-2.2.52-r1.ebuild index 00869bfbaa8c..d1d21698df38 100644 --- a/sys-apps/acl/acl-2.2.52-r1.ebuild +++ b/sys-apps/acl/acl-2.2.52-r1.ebuild @@ -51,7 +51,7 @@ multilib_src_install() { emake DIST_ROOT="${D}" install install-dev install-lib # move shared libs to / - multilib_is_native_abi && gen_usr_ldscript -a acl + gen_usr_ldscript -a acl } multilib_src_install_all() { diff --git a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild index 8c8af810c53a..ba4ae6438367 100644 --- a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild +++ b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild @@ -40,7 +40,7 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install install-dev - multilib_is_native_abi && gen_usr_ldscript -a dm + gen_usr_ldscript -a dm } multilib_src_install_all() { diff --git a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild index 3792e2d29728..e6250c468c01 100644 --- a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild +++ b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild @@ -74,7 +74,7 @@ multilib_src_test() { multilib_src_install() { default - multilib_is_native_abi && gen_usr_ldscript -a keyutils + gen_usr_ldscript -a keyutils } multilib_src_install_all() { diff --git a/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild b/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild index f78b893766e4..792bb37b7f33 100644 --- a/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild +++ b/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild @@ -83,7 +83,7 @@ python_test() { multilib_src_install() { default # move shared libs to / - multilib_is_native_abi && gen_usr_ldscript -a crack + gen_usr_ldscript -a crack do_python } diff --git a/sys-libs/cracklib/cracklib-2.9.4.ebuild b/sys-libs/cracklib/cracklib-2.9.4.ebuild index 519afb7cc021..a826ef9b3b46 100644 --- a/sys-libs/cracklib/cracklib-2.9.4.ebuild +++ b/sys-libs/cracklib/cracklib-2.9.4.ebuild @@ -82,7 +82,7 @@ python_test() { multilib_src_install() { default # move shared libs to / - multilib_is_native_abi && gen_usr_ldscript -a crack + gen_usr_ldscript -a crack do_python } diff --git a/sys-libs/cracklib/cracklib-2.9.5.ebuild b/sys-libs/cracklib/cracklib-2.9.5.ebuild index 519afb7cc021..a826ef9b3b46 100644 --- a/sys-libs/cracklib/cracklib-2.9.5.ebuild +++ b/sys-libs/cracklib/cracklib-2.9.5.ebuild @@ -82,7 +82,7 @@ python_test() { multilib_src_install() { default # move shared libs to / - multilib_is_native_abi && gen_usr_ldscript -a crack + gen_usr_ldscript -a crack do_python } diff --git a/sys-libs/cracklib/cracklib-2.9.6.ebuild b/sys-libs/cracklib/cracklib-2.9.6.ebuild index b430d4516efc..dda19c05a175 100644 --- a/sys-libs/cracklib/cracklib-2.9.6.ebuild +++ b/sys-libs/cracklib/cracklib-2.9.6.ebuild @@ -82,7 +82,7 @@ python_test() { multilib_src_install() { default # move shared libs to / - multilib_is_native_abi && gen_usr_ldscript -a crack + gen_usr_ldscript -a crack do_python } diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild index 15bd18e7377d..01d978d9e932 100644 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild @@ -64,7 +64,7 @@ multilib_src_compile() { multilib_src_install() { emake V=1 STRIP=: DESTDIR="${D}" install || die - multilib_is_native_abi && gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid') + gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid') # configure doesn't have an option to disable static libs :/ use static-libs || find "${ED}" -name '*.a' -delete } diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild index 8a191ddd4790..ee9f5a7005ef 100644 --- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild +++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild @@ -62,7 +62,7 @@ multilib_src_install() { install dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so - multilib_is_native_abi && gen_usr_ldscript -a gpm + gen_usr_ldscript -a gpm } multilib_src_install_all() { 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 diff --git a/sys-libs/ncurses/ncurses-5.9-r3.ebuild b/sys-libs/ncurses/ncurses-5.9-r3.ebuild index be2a9bd3d433..0f383d51d910 100644 --- a/sys-libs/ncurses/ncurses-5.9-r3.ebuild +++ b/sys-libs/ncurses/ncurses-5.9-r3.ebuild @@ -180,7 +180,7 @@ multilib_src_install() { fi # Move libncurses{,w} into /lib - multilib_is_native_abi && gen_usr_ldscript -a \ + gen_usr_ldscript -a \ ncurses \ $(usex unicode 'ncursesw' '') \ $(use tinfo && usex unicode 'tinfow' '') \ diff --git a/sys-libs/ncurses/ncurses-5.9-r4.ebuild b/sys-libs/ncurses/ncurses-5.9-r4.ebuild index 78abd8707422..ea8dacf4145e 100644 --- a/sys-libs/ncurses/ncurses-5.9-r4.ebuild +++ b/sys-libs/ncurses/ncurses-5.9-r4.ebuild @@ -185,7 +185,7 @@ multilib_src_install() { fi # Move libncurses{,w} into /lib - multilib_is_native_abi && gen_usr_ldscript -a \ + gen_usr_ldscript -a \ ncurses \ $(usex unicode 'ncursesw' '') \ $(use tinfo && usex unicode 'tinfow' '') \ diff --git a/sys-libs/ncurses/ncurses-5.9-r5.ebuild b/sys-libs/ncurses/ncurses-5.9-r5.ebuild index 33f97d44187d..698ed64e95b5 100644 --- a/sys-libs/ncurses/ncurses-5.9-r5.ebuild +++ b/sys-libs/ncurses/ncurses-5.9-r5.ebuild @@ -187,7 +187,7 @@ multilib_src_install() { fi # Move libncurses{,w} into /lib - multilib_is_native_abi && gen_usr_ldscript -a \ + gen_usr_ldscript -a \ ncurses \ $(usex unicode 'ncursesw' '') \ $(use tinfo && usex unicode 'tinfow' '') \ |