diff options
Diffstat (limited to 'sys-devel/binutils-config')
| -rw-r--r-- | sys-devel/binutils-config/Manifest | 4 | ||||
| -rwxr-xr-x | sys-devel/binutils-config/files/binutils-config-5 | 15 | ||||
| -rw-r--r-- | sys-devel/binutils-config/files/binutils-config-5.1 | 15 |
3 files changed, 26 insertions, 8 deletions
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest index c43792013a31..806d14647b60 100644 --- a/sys-devel/binutils-config/Manifest +++ b/sys-devel/binutils-config/Manifest @@ -1,5 +1,5 @@ -AUX binutils-config-5 12171 BLAKE2B df24e3f7629642b71ad1e97560919a0daf58b4c1066a3a6c4342b77f266f7b8f4ee5b999b71746dbb7e4863c7e35060aa255a5bb9da865a805b091362802c92b SHA512 a444f81455cfe366072cd600aebab5c66c871b7a1b3fb935a7600596fa18dc7a4a55d82b0c0a2b239b0c3ab6a488159d3c1fd6a7e1c9fd8de4096822dfb647ad -AUX binutils-config-5.1 11974 BLAKE2B 7cf382cbca13af78fd7581327e4c33a8a3c0ab2a77594de2a5b41219b7477e5e773a30d7caa731c3091d9274bc32378346db498e9a6ebd45c14e91e94dc26e5f SHA512 19cb807f663661e8c0437880bb1f330a2b5996b92d419cdc24fd95924f9c66ac76673354de879ce6f2a32721b1dab208250ae205fbcfa1d7aaa249fd15ee03e1 +AUX binutils-config-5 12583 BLAKE2B 154ec05047c0b66fe8ed2164c388c8b3b91fcd83cd807b98bc01cd5792692d7b0e8d42e991083757e619ecfaecb1403fb141364b00660c81ea728df3baec28b5 SHA512 cbe8c6840096f30c49135f51f8c67e59fb53733fba902c5e458bbb1cc00f4c469ad768ba12d5f0d50996b2f3d19ba2060c91f771b73197a41b257112bf137429 +AUX binutils-config-5.1 12386 BLAKE2B 23ea0165db58116fc2e8655f09a094e8dfc2cad51d58df5bf45eaa78a01e73c45e17cfa845aadcf65828f2ff7b149a01e9188ae85e3f56c8c83170078211cd69 SHA512 79cd64c734650d76e47e4e6a84aab408ca39d04b57fbd6ecbe953089f246e52c05a6d3d1dd69ff8864e71246c8b6f53f4b89902963ae4f6b7194b949cb0f724c AUX binutils-config.8 2710 BLAKE2B 1ed19de7f8e4552da3e13dbb99db2ad3b4c56b7d136b17dea76bf39c5e3621f58d85a9f59f39a4f8ba0aaa7b72bcfdd4aece660875b8c19477e9f99f7a22972c SHA512 185b3cd1a213afb6bd00efe59e081fb1839a8a795a8db93206ef556b0efda741a3e1b36a10d28b662aba340eb86cc73e3b94b4d0b05325104fafade295281455 AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203 EBUILD binutils-config-5-r4.ebuild 1116 BLAKE2B 43903ecf891d48aaa1a55aa76a0c3f786af3938305fce38074bc829f8201b6ba41760c31b956257a37dc39362330de90167f64134f381eb106b5749dc06067a9 SHA512 32586f809e5ec53b9d08204264711048c1fbf6e41ec1daf8f68a4573cc42e4b5c4698b9dd8cd333195f9548897eeb0edbc2fbc27b60b22302283d04b77c0a4b6 diff --git a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5 index acb72b7e3435..d4df601a74b5 100755 --- a/sys-devel/binutils-config/files/binutils-config-5 +++ b/sys-devel/binutils-config/files/binutils-config-5 @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Format of /etc/env.d/binutils/: @@ -155,7 +155,16 @@ switch_profile() { mkdir -p "${dstlib}" rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts" - find -L "${dstlib}" -xtype l -name 'lib*' -exec rm -f {} + + find -L "${dstlib}" -xtype l -name 'lib*' -delete + # Detect older binutils w/broken rpaths. #562460 + # We can hardcode the "/lib" part since that's what the binutils + # configure scripts have. They did not include any other path. + if [[ $(scanelf -qF '%r#F' "${ROOT}/${BINPATH}/as") == */lib ]] ; then + ewarn "Old cross-binutils detected; please re-emerge to fix (see bug #562460)." + for x in lib* ; do + atomic_ln "${LIBPATH}/${x}" "${dstlib}" "${x}" + done + fi # # Clean out old generated include symlinks @@ -248,7 +257,7 @@ uninstall_target() { local x for x in \ - addr2line ar as c++filt elf2flt elfedit flthdr gprof \ + addr2line ar as c++filt dwp elf2flt elfedit flthdr gprof \ ld ld.{bfd,gold,real} \ nm objcopy objdump ranlib readelf size strings strip do diff --git a/sys-devel/binutils-config/files/binutils-config-5.1 b/sys-devel/binutils-config/files/binutils-config-5.1 index ec06d47c14a7..26ff278eece5 100644 --- a/sys-devel/binutils-config/files/binutils-config-5.1 +++ b/sys-devel/binutils-config/files/binutils-config-5.1 @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Format of /etc/env.d/binutils/: @@ -155,7 +155,16 @@ switch_profile() { mkdir -p "${dstlib}" rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts" - find -L "${dstlib}" -xtype l -name 'lib*' -exec rm -f {} + + find -L "${dstlib}" -xtype l -name 'lib*' -delete + # Detect older binutils w/broken rpaths. #562460 + # We can hardcode the "/lib" part since that's what the binutils + # configure scripts have. They did not include any other path. + if [[ $(scanelf -qF '%r#F' "${ROOT}/${BINPATH}/as") == */lib ]] ; then + ewarn "Old cross-binutils detected; please re-emerge to fix (see bug #562460)." + for x in lib* ; do + atomic_ln "${LIBPATH}/${x}" "${dstlib}" "${x}" + done + fi # # Clean out old generated include symlinks @@ -240,7 +249,7 @@ uninstall_target() { local x for x in \ - addr2line ar as c++filt elf2flt elfedit flthdr gprof \ + addr2line ar as c++filt dwp elf2flt elfedit flthdr gprof \ ld ld.{bfd,gold,real} \ nm objcopy objdump ranlib readelf size strings strip do |