commit: 15168301ed6522221d99279503a4d2e98b8ff6d2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Tue Sep 12 08:38:36 2017 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Tue Sep 12 08:38:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=15168301
sys-devel/binutils: sync, add patch for solaris/anonymous version scripts Package-Manager: Portage-2.3.8-prefix, Repoman-2.3.3 RepoMan-Options: --force sys-devel/binutils/Manifest | 2 ++ sys-devel/binutils/binutils-2.28.1.ebuild | 31 ++++++++++++++++++++++ ...2.22-solaris-anonymous-version-script-fix.patch | 24 +++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest index 904ae6a2be..bfb43e8b96 100644 --- a/sys-devel/binutils/Manifest +++ b/sys-devel/binutils/Manifest @@ -33,3 +33,5 @@ DIST binutils-2.26.1-patches-1.0.tar.xz 11212 SHA256 e56e2a6b64b8abe2f4aed1a9b15 DIST binutils-2.26.1.tar.bz2 25595243 SHA256 39c346c87aa4fb14b2f786560aec1d29411b6ec34dce3fe7309fe3dd56949fd8 SHA512 9d9165609fd3b0f20d616f9891fc8e2b466eb13e2bfce40125e12427f8f201d20e2b8322bb6cb2b45e8df812f0e8ac059149f8a1f69ba3ed9d86a35c6a540b67 WHIRLPOOL c33eecdf855dd17314c3b7bbb0060399148d4dba867eb038bfb7555010fd003ba8b5b86480e4df389e19bba7b1fd0b9264291e6af20be4ffd4ff504d2255d003 DIST binutils-2.27-patches-1.0.tar.xz 8852 SHA256 07be45786e1e56498aad2c52a43d4104ccd0ded3c6a84a930486bc418d7fa36d SHA512 489b5fff87886682d8e98eafa2f082e6dcf811d2a693b6c41d76bd1ac50815a6e7d26fb7c9e3811c2d8e0e1dc307557e6ffe46d1d0f7caeb581060cf14bda899 WHIRLPOOL cf73342292a6dd8450a420f62a6a28e1ae38eed2c0b62643619ac002f3e9233ba5a0df19deb862167e88bd2c4a7ef4e002fe4d76f971eba876014d145dc30171 DIST binutils-2.27.tar.bz2 26099568 SHA256 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88 SHA512 cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb WHIRLPOOL d3204b4900529f697285fb1fe622ecc949c43f064e6b83a1cecb1ea8810a214842c729266c9a44537dc0a86d6d2b3ac100f54c721cc284e54f9d6feb90930d15 +DIST binutils-2.28.1-patches-1.0.tar.xz 19772 SHA256 50cfce6ef7f546dcdb983a8b632507b5cdd51095e4acf1f15bfcd68027d438a4 SHA512 c2c7d22e1013e79040c4dcb4d70649e78a070976ba3a4bc2ceb4805827b9d93eea1805c85db4fcb6b31be5218c3d7b42a4990437a7c01dc01fd7e9dedb606828 WHIRLPOOL 2369fce643cc9b83724b486521621d744de0eaf3d95fdd34c7f1c785bc400f3ed31ae6105001870f33539664d84dd9caae854725e20007f136929d2ece755247 +DIST binutils-2.28.1.tar.bz2 28120394 SHA256 6924999be62d4464458eb53c11f27277cfb63755df8c1cd47b8d15d02c1942ea SHA512 5ec5212497b0fa8324f6a0884c284cb71c01942bbd39356d1ae745a5c9d97274c10f9d9c723f4bef6f0217662dfcd0c36e4e955a7599b11217658dc7b97553eb WHIRLPOOL 5c616f719827e5da7db23e89c761323cd4828b4779e79c3983d3ea429bce57ed40219982c478237b4dd728b77bae0a6447d912d96490ed1f5fc279ba5fd73bc6 diff --git a/sys-devel/binutils/binutils-2.28.1.ebuild b/sys-devel/binutils/binutils-2.28.1.ebuild new file mode 100644 index 0000000000..bf51c569c2 --- /dev/null +++ b/sys-devel/binutils/binutils-2.28.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +PATCHVER="1.0" +ELF2FLT_VER="" +inherit toolchain-binutils + +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +PATCHES=( + "${FILESDIR}"/${PN}-2.22-solaris-anonymous-version-script-fix.patch +# "${FILESDIR}"/${PN}-2.22-mint.patch +# "${FILESDIR}"/${PN}-2.19.50.0.1-mint.patch + "${FILESDIR}"/${PN}-2.24-cygwin-nointl.patch +) +pkg_setup() { + [[ ${CHOST} == *-mint* ]] && die "mint patches require rebasing to ${P}" # 609274 +} + +src_compile() { + if has noinfo "${FEATURES}" \ + || ! type -p makeinfo >/dev/null + then + # binutils >= 2.17 (accidentally?) requires 'makeinfo' + export EXTRA_EMAKE="MAKEINFO=true" + fi + + toolchain-binutils_src_compile +} diff --git a/sys-devel/binutils/files/binutils-2.22-solaris-anonymous-version-script-fix.patch b/sys-devel/binutils/files/binutils-2.22-solaris-anonymous-version-script-fix.patch new file mode 100644 index 0000000000..e4abccd4ee --- /dev/null +++ b/sys-devel/binutils/files/binutils-2.22-solaris-anonymous-version-script-fix.patch @@ -0,0 +1,24 @@ +https://sourceware.org/bugzilla/show_bug.cgi?id=12548 + +diff --git a/ld/emultempl/solaris2.em b/ld/emultempl/solaris2.em +index dfb173d..84c9629 100644 +--- a/ld/emultempl/solaris2.em ++++ b/ld/emultempl/solaris2.em +@@ -100,8 +100,15 @@ elf_solaris2_before_allocation (void) + if (soname == NULL) + soname = lbasename (bfd_get_filename (link_info.output_bfd)); + +- /* Register the node. */ +- lang_register_vers_node (soname, basever, NULL); ++ /* PR 12548: For compatibility with the Solaris linker we convert ++ an already existing anonymous version tag into base version tag. */ ++ if (link_info.version_info != NULL ++ && (soname == NULL || soname[0] == '\0' ++ || link_info.version_info->name[0] == '\0')) ++ basever->vernum = 0; ++ else ++ /* Register the node. */ ++ lang_register_vers_node (soname, basever, NULL); + /* Enforce base version. The encoded vd_ndx is vernum + 1. */ + basever->vernum = 0; + }