| 1 |
commit: 6bb4b76b620db58709e18a0206d12581389ed746 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 8 09:48:22 2015 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 8 09:48:22 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=6bb4b76b |
| 7 |
|
| 8 |
sys-devel/binutils-config: import -5 and revert -4. |
| 9 |
|
| 10 |
sys-devel/binutils-config/ChangeLog | 55 ++++++++- |
| 11 |
sys-devel/binutils-config/Manifest | 17 ++- |
| 12 |
.../binutils-config/binutils-config-4-r2.ebuild | 24 ++++ |
| 13 |
.../binutils-config/binutils-config-4-r3.ebuild | 24 ++++ |
| 14 |
.../binutils-config/binutils-config-4-r4.ebuild | 28 +++++ |
| 15 |
sys-devel/binutils-config/binutils-config-5.ebuild | 40 ++++++ |
| 16 |
sys-devel/binutils-config/files/binutils-config-4 | 94 +++++++------- |
| 17 |
.../files/{binutils-config-4 => binutils-config-5} | 136 +++++++++++---------- |
| 18 |
sys-devel/binutils-config/files/binutils.eselect | 45 +++++++ |
| 19 |
9 files changed, 338 insertions(+), 125 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog |
| 22 |
index 8fb2d57..1eac8c7 100644 |
| 23 |
--- a/sys-devel/binutils-config/ChangeLog |
| 24 |
+++ b/sys-devel/binutils-config/ChangeLog |
| 25 |
@@ -1,6 +1,57 @@ |
| 26 |
# ChangeLog for sys-devel/binutils-config |
| 27 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.66 2014/07/29 11:15:38 vapier Exp $ |
| 29 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.79 2015/05/25 06:07:20 vapier Exp $ |
| 31 |
+ |
| 32 |
+*binutils-config-4-r3 (25 May 2015) |
| 33 |
+ |
| 34 |
+ 25 May 2015; Mike Frysinger <vapier@g.o> +binutils-config-4-r3.ebuild, |
| 35 |
+ files/binutils-config-4: |
| 36 |
+ Do not delete native ld.so.conf.d fragment when uninstalling cross binutils |
| 37 |
+ #549708 by Alexander Tsoy. |
| 38 |
+ |
| 39 |
+ 25 May 2015; Mike Frysinger <vapier@g.o> binutils-config-4-r2.ebuild: |
| 40 |
+ Mark arm64/m68k/s390/sh stable. |
| 41 |
+ |
| 42 |
+ 26 Apr 2015; Mikle Kolyada <zlogene@g.o> binutils-config-4-r2.ebuild: |
| 43 |
+ ia64 stable wrt bug #547330 |
| 44 |
+ |
| 45 |
+ 26 Apr 2015; Mikle Kolyada <zlogene@g.o> binutils-config-4-r2.ebuild: |
| 46 |
+ alpha stable wrt bug #547330 |
| 47 |
+ |
| 48 |
+ 26 Apr 2015; Pacho Ramos <pacho@g.o> binutils-config-4-r2.ebuild: |
| 49 |
+ ppc stable wrt bug #547330 |
| 50 |
+ |
| 51 |
+ 24 Apr 2015; Mikle Kolyada <zlogene@g.o> binutils-config-4-r2.ebuild: |
| 52 |
+ arm stable wrt bug #547330 |
| 53 |
+ |
| 54 |
+ 23 Apr 2015; Mikle Kolyada <zlogene@g.o> binutils-config-4-r2.ebuild: |
| 55 |
+ sparc stable wrt bug #547330 |
| 56 |
+ |
| 57 |
+ 23 Apr 2015; Mikle Kolyada <zlogene@g.o> binutils-config-4-r2.ebuild: |
| 58 |
+ x86 stable wrt bug #547330 |
| 59 |
+ |
| 60 |
+ 22 Apr 2015; Jeroen Roovers <jer@g.o> binutils-config-4-r2.ebuild: |
| 61 |
+ Stable for PPC64 (bug #547330). |
| 62 |
+ |
| 63 |
+ 22 Apr 2015; Jeroen Roovers <jer@g.o> binutils-config-4-r2.ebuild: |
| 64 |
+ Stable for HPPA (bug #547330). |
| 65 |
+ |
| 66 |
+ 22 Apr 2015; Mikle Kolyada <zlogene@g.o> binutils-config-4-r2.ebuild: |
| 67 |
+ amd64 stable wrt bug #547330 |
| 68 |
+ |
| 69 |
+*binutils-config-4-r2 (09 Feb 2015) |
| 70 |
+ |
| 71 |
+ 09 Feb 2015; Mike Frysinger <vapier@g.o> +binutils-config-4-r2.ebuild, |
| 72 |
+ files/binutils-config-4: |
| 73 |
+ Fix by Ruud Koolen for ROOT handling with man/info paths #532610 by Ruud |
| 74 |
+ Koolen. |
| 75 |
+ |
| 76 |
+*binutils-config-4-r1 (30 Dec 2014) |
| 77 |
+ |
| 78 |
+ 30 Dec 2014; Anthony G. Basile <blueness@g.o> |
| 79 |
+ +binutils-config-4-r1.ebuild, -binutils-config-4.ebuild, |
| 80 |
+ files/binutils-config-4: |
| 81 |
+ Address bug #504120 |
| 82 |
|
| 83 |
*binutils-config-4 (29 Jul 2014) |
| 84 |
|
| 85 |
|
| 86 |
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest |
| 87 |
index 1c31866..39d38f2 100644 |
| 88 |
--- a/sys-devel/binutils-config/Manifest |
| 89 |
+++ b/sys-devel/binutils-config/Manifest |
| 90 |
@@ -1,11 +1,10 @@ |
| 91 |
-AUX binutils-config-1.9 11043 SHA256 20becd27cd1161d3afcd079ebff883b8eba3e698171937d82a9575dfa19a2373 SHA512 d0366bd547d7c2adddf30975a361b2f25d008f0203db9e53cd81e635fd081e0ce13940a1df511f6edc7a11d6c4e641567cb750006cbbaa7b5bfd118bf6f87464 WHIRLPOOL d2c06206ffb351226db6db89e305042c03cf3cfa628c440fd3fd7274bf0c62c8ba61599f4997714075dc9f61b57a46709824eded2a31678bc2668e43c982ce91 |
| 92 |
-AUX binutils-config-2 11440 SHA256 5e923d1445910b9b9d1e455e52313087098689359846db0dc3fa52d33b63b192 SHA512 16b8bc2277bb50fb803377b192368a7abf7c97b5959bdd0d67fcf508220164d29ee2cfc1526ecfce7125b7492a0a5e4f094e948fa5ba9af44487229af3d91197 WHIRLPOOL 3acedb96e6c0c97e2223aa5fffcfb59f7e7b311c883e1557191db14b166a01d14ecd6eafbd4a4dbd33ceb2ca388fa7bf54d8291a24bb5e26a5634e2c8fb2a2df |
| 93 |
-AUX binutils-config-3 13874 SHA256 d4395a6480a179165098433235726f416aea4029474ecf93534c4ec844422788 SHA512 8c486629109fd67bebc248a629d38bc2ad0546c70fe42e82ccb609932ec2cdbe32545486f437bb15c81318ad7d9f962fdd63fe1156ea844c31ba2812362a792c WHIRLPOOL 8555808ff549955ba93b9331ccf5424056817339745309b6f5b3064f594f22ae44eeab0cd3b9724b67fe1860cfb5048b8c95792075b6b4423659a75ef6633783 |
| 94 |
-AUX binutils-config-4 12111 SHA256 1d6cf0d1e26e928c5a8c77f98fd8414b21b7b407fcce8621fb10c90820676b1d SHA512 a3d91417e46bd17b911e205469d665632c5ab7f222f3759736302fd72734ef350973412f1f4876abe796248818594037f8a17c3d5fa1f8f30afb974bc7d7bd39 WHIRLPOOL f5f8345e3a4bae9f5f92f9dfa1decbdd9ff15efcae923a41bfc6f2a0f09767a3b229351c6509175a2bbecedc26e8e26f3f4f70028e03096e5c8b0941629d436b |
| 95 |
+AUX binutils-config-4 11570 SHA256 09ca8e043c07da03ea247bb8cff2777d989f8d435421299de59307c78db1cd8b SHA512 cd987bada67cc222230c3592edf5391caa6c5fcb15081f9acb40befdd351f8a539bde8b9d921cb5c13d6f246b5eecf4fdda9f49bf899f086c966ff6fe558c12e WHIRLPOOL e840e7c1137c4598bdd7989f584d18cefa820c86d74d8755718f5aa5e572e79e669cecff23ba6bfc0027110991e5f72c457cb15c910c4bb1e60b8d1e6f660b86 |
| 96 |
+AUX binutils-config-5 12023 SHA256 261c32814ec804961bb919a53db58618e765784bd646d635455c8ca96c5ed7df SHA512 61d8b1849661ff8424635abc06c14e92cbbe7c8f23ce1d96d0297d3f569ddc5cf52f29aab18be276b70dc85d320b0699c960631dfffc583ba5e232a6731df14f WHIRLPOOL cc07c5e9deec78a053d44b79cd714c43815d73e93fbae795335c688bc14cdc71fbc232c9c1b47e2f73f2f0b65e8c0a3a83aec5747d89a52096eab302315dbe4b |
| 97 |
AUX binutils-config.8 2837 SHA256 20817cd2e6e3a8ace12ada7b73ada556d597527adcad02876e522e0b6396d4a3 SHA512 66a260499c1100dc71469e4ca1e2b0f71410382138c381e6a6ed4e4aa19520607407ffa6a28e0388e0abe5ee86769b662cec29cdb2ff02cc6c05af64314db5d9 WHIRLPOOL 8bbc5c525b1c7a3ec147458569d570a3312034da2c75c1f31c4cd888db5205aa0a8c8ec061b2354d8ac80b43bdbdf1559a92e904dae5f681345fe758794c2535 |
| 98 |
-EBUILD binutils-config-1.9-r4.ebuild 626 SHA256 4445f3282acda5b7c96146974adefc47315c437b5eb008daab9ac5f87a18d99d SHA512 82089adb1b63b386280f512a096836189bcd42995f7058cb211c7b01860788be24a4112c3345dd4042ed7b2311bc7b5a40248e55ad2e958519d6b8fd7e341d5e WHIRLPOOL b4409b6e396e42bf0dea54a1cc8aa912d7f1f215d7143d955ead38b1dea883d95b0b518fe198df72f21af8a954b148b7d18d292d6965a82417856fffccaa0ac7 |
| 99 |
-EBUILD binutils-config-2-r1.ebuild 627 SHA256 06d97c5306e671ccf55fcad8eec8dcd20e1c6c3bb8e4646771d62af5f1e1754f SHA512 856c552643f31f3df0218442c0290f7cb090c5088e0796ad03e5e07f5bdf0f8d3233b1659556e5768909a557971e5e5ebc702ba4a39658c7a862c4d5336364e6 WHIRLPOOL e5af63fd41361217f60dcfa84a605616a7bb0037fb986f00f3f866dff19bfa3fb96365b10be4854b6a27d643ccb2d682910644df5941e7f4d88f341ae2e6ad3c |
| 100 |
-EBUILD binutils-config-3-r3.ebuild 645 SHA256 f06ca4397099677760eca41ef1ea3fc4cc3f55d755ff1cd51d607e60bf850af9 SHA512 73a592d324d7d537c3d67ad7402f13fe2b165fc241db373dd982015ada8b92d0bf961dd01e705cd3e77f704811535053f7a360fa24437bf25f5305f3f9713702 WHIRLPOOL 75f57d9150498c247589500945f09b07f83d12e86e4f7c213f86ffa6c8af51b28c60e18ea85b51cc02fd9fa1c30bd969c366aba2d81c7690d2a09be0eac8d413 |
| 101 |
-EBUILD binutils-config-4.ebuild 694 SHA256 c3d1239293d5b9202bca8ad676589f8fc4765b2f2f020a444013d802205efb5c SHA512 642fc5e12d4f2ff18d9344e43ab8a921230374df8e3c532e01368753053d084ef95fc93bfe5c6dbfdfce6ef8eeed86e3cdcece287ccf4330b0f74581537f2a47 WHIRLPOOL 342d7c82e29142a42bacc90a5a70167b17b339a1957ecd441b866227249009959f0bcdf66ac1fff38b3f0e450e7fc322fe787ecedfb95a2717215785b08a3b63 |
| 102 |
-MISC ChangeLog 10973 SHA256 ccd4960beebcbc858597c6a2fcc518804f496c580dcd60614f8eadc21237defc SHA512 d0ca8953ac9b086e22d658d7c81657461f31d30da13cf9125819fe0f937ad185d8667e8b55d68c82ec71a00c70bc18683cfbc5df40b8118af6beb27ce977329e WHIRLPOOL 512320d1ded539d35cbd8b2a1240bdd871841c1727a9de91b6aa7e0b8f498da19c572816ad1211546a5818b8ecb1ee32f2037964ade786e2cc970184c86e26b9 |
| 103 |
+AUX binutils.eselect 810 SHA256 e579d3bffc645730f396ebc01d9f9f1043ee8db5edb1f41d5aeadeedcf6aa295 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203 WHIRLPOOL 5ae5fd07213e2be381824aea237aa2cc47a987a2ee6508fcd8f18424f8e3de89be71f1de781240af45b98f7525048be2ab7cb60893384efbcde8f8a92a32c73a |
| 104 |
+EBUILD binutils-config-4-r2.ebuild 589 SHA256 2ed036c4de98c14f8529cda7f20053fc46afa4f2d284a91c6dc2509f09823c5c SHA512 f4b5a3836a3e02a3c27ed30efe365feff8ace91c22fc9b53bce5e434b358067e2f6cdd5229c65df25794a1188327610423a76a216da96ea2a710e6c7c0e39e56 WHIRLPOOL ea5d882beb17908182762ac0159045b647858dbd73c535babfb82d67d4fd14da3c017e9ba729435ca6317175aaf5de896feecf52ba0e7e76cb47b5c3eeb02223 |
| 105 |
+EBUILD binutils-config-4-r3.ebuild 602 SHA256 15ce445a5ff179785bc453db3284387c9c4131adc49a7ac1552842ed41a6a3f0 SHA512 e53331878b1ac1b9c748ec167965f02769f46a6fae9cc24bed3237c9e593b3eca67b25d49ab8c1d2a8b9cd5bd9aae0b33c445b4c0c3e4e62b05f7594a79af104 WHIRLPOOL 8694df18f030fd023ac79a5df65da7920bbdd4db4f80bba3bc7dbb072b90dcc641d1efca5aaea33b056bd077e3ac2479d027a16a1530884605480b9cd162ee34 |
| 106 |
+EBUILD binutils-config-4-r4.ebuild 704 SHA256 fc57abc3f09896a2f89fa0ed0bf5be6160adf077c3d42d9af274d278f55e3687 SHA512 3df81f0b9d2a8257352239778bc7e153d03e081636eb5772d8e67625308ee2636cd9a1525df07ac44c743e80ccd285d060646e86c5656ace33ec04bbc1cf437b WHIRLPOOL fa222755455f5c7e93b592d641f29f7eb700c3158172bd4fc62452c2fdc1fa0fbb7dd08652ce550b1328750f9fc6386ac49a42a21450843c6872e4d4b1a32d5d |
| 107 |
+EBUILD binutils-config-5.ebuild 1029 SHA256 9232e53f25ca5c17669b91007767c7ffb70374cfe85cb8702792e07483128011 SHA512 099451164d3704b8025eccb3135ce5988012072e746eaf284589d1371f11df4db7f7c26bd109d1e646cd574b66fbadf83993da77b84c144e9378bb2ea2f256ea WHIRLPOOL 523ea50fef3c3d5727704b05ad139031b21dd2aeadb5b1fae7a38253514508fb7f5e7ddaac83a25bae3257e36b06932315267528e62a740734b666d5dbc7384d |
| 108 |
+MISC ChangeLog 12757 SHA256 996edd94d7f8b82e690fa028e8e729ba1aafff0e2e8dd2fa358718ee990546df SHA512 bf644ca23b2dcd20d8a7279377711d976211e91bf4c41f10638383dc1a3e2c215864e3328984f50f0d2137474a9d07dcd499eca16a8e2df757f54295a52b5ac3 WHIRLPOOL 5de7f1e57ca53bca17deef27b6a2c52b816d7df586fbbfc92304d8a518a2fd6ef31911f4b2012fb9b8b10210038fcfab05a3871a67545b7f4dfd6eab04c85c4e |
| 109 |
MISC metadata.xml 162 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a SHA512 2a857e10b277827773a6c7967e070d7bfff23d75f44fa4d4fa8a7339df3225e6dba512a865d91c9c55bdb013dafdce85dface1b845acfbb5473e232666cdda45 WHIRLPOOL f7586c1570803b3e646f0be89ba6c767e82ec6889ef92d15f62a38f1410ed9d82c36892e5e83f694471959783d0d5ad667f1a39b7eb51f2080c269d5fa23d819 |
| 110 |
|
| 111 |
diff --git a/sys-devel/binutils-config/binutils-config-4-r2.ebuild b/sys-devel/binutils-config/binutils-config-4-r2.ebuild |
| 112 |
new file mode 100644 |
| 113 |
index 0000000..ed29997 |
| 114 |
--- /dev/null |
| 115 |
+++ b/sys-devel/binutils-config/binutils-config-4-r2.ebuild |
| 116 |
@@ -0,0 +1,24 @@ |
| 117 |
+# Copyright 1999-2015 Gentoo Foundation |
| 118 |
+# Distributed under the terms of the GNU General Public License v2 |
| 119 |
+# $Id$ |
| 120 |
+ |
| 121 |
+EAPI="4" |
| 122 |
+ |
| 123 |
+DESCRIPTION="Utility to change the binutils version being used" |
| 124 |
+HOMEPAGE="https://www.gentoo.org/" |
| 125 |
+SRC_URI="" |
| 126 |
+ |
| 127 |
+LICENSE="GPL-2" |
| 128 |
+SLOT="0" |
| 129 |
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 130 |
+IUSE="" |
| 131 |
+ |
| 132 |
+# We also RDEPEND on sys-apps/findutils which is in base @system |
| 133 |
+RDEPEND="sys-apps/gentoo-functions" |
| 134 |
+ |
| 135 |
+S=${WORKDIR} |
| 136 |
+ |
| 137 |
+src_install() { |
| 138 |
+ newbin "${FILESDIR}"/${PN}-${PV} ${PN} |
| 139 |
+ doman "${FILESDIR}"/${PN}.8 |
| 140 |
+} |
| 141 |
|
| 142 |
diff --git a/sys-devel/binutils-config/binutils-config-4-r3.ebuild b/sys-devel/binutils-config/binutils-config-4-r3.ebuild |
| 143 |
new file mode 100644 |
| 144 |
index 0000000..58ade48 |
| 145 |
--- /dev/null |
| 146 |
+++ b/sys-devel/binutils-config/binutils-config-4-r3.ebuild |
| 147 |
@@ -0,0 +1,24 @@ |
| 148 |
+# Copyright 1999-2015 Gentoo Foundation |
| 149 |
+# Distributed under the terms of the GNU General Public License v2 |
| 150 |
+# $Id$ |
| 151 |
+ |
| 152 |
+EAPI="4" |
| 153 |
+ |
| 154 |
+DESCRIPTION="Utility to change the binutils version being used" |
| 155 |
+HOMEPAGE="https://www.gentoo.org/" |
| 156 |
+SRC_URI="" |
| 157 |
+ |
| 158 |
+LICENSE="GPL-2" |
| 159 |
+SLOT="0" |
| 160 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 161 |
+IUSE="" |
| 162 |
+ |
| 163 |
+# We also RDEPEND on sys-apps/findutils which is in base @system |
| 164 |
+RDEPEND="sys-apps/gentoo-functions" |
| 165 |
+ |
| 166 |
+S=${WORKDIR} |
| 167 |
+ |
| 168 |
+src_install() { |
| 169 |
+ newbin "${FILESDIR}"/${PN}-${PV} ${PN} |
| 170 |
+ doman "${FILESDIR}"/${PN}.8 |
| 171 |
+} |
| 172 |
|
| 173 |
diff --git a/sys-devel/binutils-config/binutils-config-4-r4.ebuild b/sys-devel/binutils-config/binutils-config-4-r4.ebuild |
| 174 |
new file mode 100644 |
| 175 |
index 0000000..c70e4bb |
| 176 |
--- /dev/null |
| 177 |
+++ b/sys-devel/binutils-config/binutils-config-4-r4.ebuild |
| 178 |
@@ -0,0 +1,28 @@ |
| 179 |
+# Copyright 1999-2015 Gentoo Foundation |
| 180 |
+# Distributed under the terms of the GNU General Public License v2 |
| 181 |
+# $Id$ |
| 182 |
+ |
| 183 |
+EAPI="4" |
| 184 |
+ |
| 185 |
+DESCRIPTION="Utility to change the binutils version being used" |
| 186 |
+HOMEPAGE="https://www.gentoo.org/" |
| 187 |
+SRC_URI="" |
| 188 |
+ |
| 189 |
+LICENSE="GPL-2" |
| 190 |
+SLOT="0" |
| 191 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 192 |
+IUSE="" |
| 193 |
+ |
| 194 |
+# We also RDEPEND on sys-apps/findutils which is in base @system |
| 195 |
+RDEPEND="sys-apps/gentoo-functions |
| 196 |
+ !<app-admin/eselect-1.4.5" |
| 197 |
+ |
| 198 |
+S=${WORKDIR} |
| 199 |
+ |
| 200 |
+src_install() { |
| 201 |
+ newbin "${FILESDIR}"/${PN}-${PV} ${PN} |
| 202 |
+ doman "${FILESDIR}"/${PN}.8 |
| 203 |
+ |
| 204 |
+ insinto /usr/share/eselect/modules |
| 205 |
+ doins "${FILESDIR}"/binutils.eselect |
| 206 |
+} |
| 207 |
|
| 208 |
diff --git a/sys-devel/binutils-config/binutils-config-5.ebuild b/sys-devel/binutils-config/binutils-config-5.ebuild |
| 209 |
new file mode 100644 |
| 210 |
index 0000000..f3a4c32 |
| 211 |
--- /dev/null |
| 212 |
+++ b/sys-devel/binutils-config/binutils-config-5.ebuild |
| 213 |
@@ -0,0 +1,40 @@ |
| 214 |
+# Copyright 1999-2015 Gentoo Foundation |
| 215 |
+# Distributed under the terms of the GNU General Public License v2 |
| 216 |
+# $Id$ |
| 217 |
+ |
| 218 |
+EAPI="4" |
| 219 |
+ |
| 220 |
+DESCRIPTION="Utility to change the binutils version being used" |
| 221 |
+HOMEPAGE="https://www.gentoo.org/" |
| 222 |
+SRC_URI="" |
| 223 |
+ |
| 224 |
+LICENSE="GPL-2" |
| 225 |
+SLOT="0" |
| 226 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 227 |
+IUSE="" |
| 228 |
+ |
| 229 |
+# We also RDEPEND on sys-apps/findutils which is in base @system |
| 230 |
+RDEPEND="sys-apps/gentoo-functions |
| 231 |
+ !<app-admin/eselect-1.4.5" |
| 232 |
+ |
| 233 |
+S=${WORKDIR} |
| 234 |
+ |
| 235 |
+src_install() { |
| 236 |
+ newbin "${FILESDIR}"/${PN}-${PV} ${PN} |
| 237 |
+ doman "${FILESDIR}"/${PN}.8 |
| 238 |
+ |
| 239 |
+ insinto /usr/share/eselect/modules |
| 240 |
+ doins "${FILESDIR}"/binutils.eselect |
| 241 |
+} |
| 242 |
+ |
| 243 |
+pkg_preinst() { |
| 244 |
+ # Force a refresh when upgrading from an older version that symlinked |
| 245 |
+ # in all the libs & includes that binutils-libs handles. #528088 |
| 246 |
+ if has_version "<${CATEGORY}/${PN}-5" ; then |
| 247 |
+ local bc current |
| 248 |
+ bc="${ED}/usr/bin/binutils-config" |
| 249 |
+ if current=$("${bc}" -c) ; then |
| 250 |
+ "${bc}" "${current}" |
| 251 |
+ fi |
| 252 |
+ fi |
| 253 |
+} |
| 254 |
|
| 255 |
diff --git a/sys-devel/binutils-config/files/binutils-config-4 b/sys-devel/binutils-config/files/binutils-config-4 |
| 256 |
old mode 100755 |
| 257 |
new mode 100644 |
| 258 |
index 3bf84fe..18fc00d |
| 259 |
--- a/sys-devel/binutils-config/files/binutils-config-4 |
| 260 |
+++ b/sys-devel/binutils-config/files/binutils-config-4 |
| 261 |
@@ -1,30 +1,24 @@ |
| 262 |
#!/bin/bash |
| 263 |
-# Copyright 1999-2014 Gentoo Foundation |
| 264 |
+# Copyright 1999-2015 Gentoo Foundation |
| 265 |
# Distributed under the terms of the GNU General Public License v2 |
| 266 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.1 2014/07/29 11:15:38 vapier Exp $ |
| 267 |
+# $Id$ |
| 268 |
|
| 269 |
# Format of /etc/env.d/binutils/: |
| 270 |
# config-TARGET: CURRENT=version for TARGET |
| 271 |
# TARGET-VER: has a TARGET and VER variable |
| 272 |
|
| 273 |
-EPREFIX="@GENTOO_PORTAGE_EPREFIX@" |
| 274 |
-if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then |
| 275 |
- EPREFIX="" |
| 276 |
-fi |
| 277 |
- |
| 278 |
: ${ROOT:=/} |
| 279 |
[[ ${ROOT} != */ ]] && ROOT="${ROOT}/" |
| 280 |
[[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}" |
| 281 |
|
| 282 |
-EROOT="${ROOT%/}${EPREFIX}/" |
| 283 |
- |
| 284 |
-cd "${EPREFIX}/" |
| 285 |
+cd / |
| 286 |
|
| 287 |
trap ":" INT QUIT TSTP |
| 288 |
|
| 289 |
argv0=${0##*/} |
| 290 |
-source "${EPREFIX}"/etc/init.d/functions.sh || { |
| 291 |
- echo "${argv0}: Could not source ${EPREFIX}/etc/init.d/functions.sh!" 1>&2 |
| 292 |
+FUNCTIONS_SH="/lib/gentoo/functions.sh" |
| 293 |
+source ${FUNCTIONS_SH} || { |
| 294 |
+ echo "${argv0}: Could not source ${FUNCTIONS_SH}!" 1>&2 |
| 295 |
exit 1 |
| 296 |
} |
| 297 |
esyslog() { :; } |
| 298 |
@@ -103,14 +97,14 @@ setup_env() { |
| 299 |
# Newer paths: /usr/${HOST}/${TARGET}/... |
| 300 |
# Older paths: /usr/${TARGET}/... |
| 301 |
# |
| 302 |
- if [[ -d "${EROOT}"/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then |
| 303 |
- BINPATH="${EPREFIX}"/usr/${HOST}/${TARGET}/binutils-bin/${VER} |
| 304 |
- BINPATH_LINKS="${EPREFIX}"/usr/libexec/gcc/${TARGET} |
| 305 |
+ if [[ -d ${ROOT}/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then |
| 306 |
+ BINPATH=/usr/${HOST}/${TARGET}/binutils-bin/${VER} |
| 307 |
+ BINPATH_LINKS=/usr/libexec/gcc/${TARGET} |
| 308 |
fi |
| 309 |
fi |
| 310 |
if [[ -z ${BINPATH} ]] ; then |
| 311 |
- BINPATH="${EPREFIX}"/usr/${TARGET}/binutils-bin/${VER} |
| 312 |
- BINPATH_LINKS="${EPREFIX}"/usr/${TARGET}/bin |
| 313 |
+ BINPATH=/usr/${TARGET}/binutils-bin/${VER} |
| 314 |
+ BINPATH_LINKS=/usr/${TARGET}/bin |
| 315 |
fi |
| 316 |
} |
| 317 |
|
| 318 |
@@ -120,24 +114,24 @@ switch_profile() { |
| 319 |
setup_env || return 1 |
| 320 |
|
| 321 |
cd "${ROOT}/${BINPATH}" || exit 1 |
| 322 |
- mkdir -p "${ROOT}/${BINPATH_LINKS}" "${EROOT}/usr/bin" |
| 323 |
+ mkdir -p "${ROOT}/${BINPATH_LINKS}" "${ROOT}/usr/bin" |
| 324 |
for x in * ; do |
| 325 |
atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}" |
| 326 |
- atomic_ln "${BINPATH_LINKS}/${x}" "${EROOT}/usr/bin" "${TARGET}-${x}" |
| 327 |
+ atomic_ln "${BINPATH_LINKS}/${x}" "${ROOT}/usr/bin" "${TARGET}-${x}" |
| 328 |
if [[ ${TARGET} == ${HOST} ]] ; then |
| 329 |
- atomic_ln "${TARGET}-${x}" "${EROOT}/usr/bin" "${x}" |
| 330 |
+ atomic_ln "${TARGET}-${x}" "${ROOT}/usr/bin" "${x}" |
| 331 |
fi |
| 332 |
done |
| 333 |
|
| 334 |
# |
| 335 |
# Generate library / ldscripts symlinks |
| 336 |
# |
| 337 |
- : ${LIBPATH:=${EPREFIX}/usr/lib/binutils/${TARGET}/${VER}} |
| 338 |
+ : ${LIBPATH:=/usr/lib/binutils/${TARGET}/${VER}} |
| 339 |
cd "${ROOT}/${LIBPATH}" || exit 1 |
| 340 |
if [[ ${TARGET} == ${HOST} ]] ; then |
| 341 |
- dstlib=${EROOT}/usr/${HOST}/lib |
| 342 |
+ dstlib=${ROOT}/usr/${HOST}/lib |
| 343 |
else |
| 344 |
- dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib |
| 345 |
+ dstlib=${ROOT}/usr/${HOST}/${TARGET}/lib |
| 346 |
fi |
| 347 |
# When upgrading, we need to clean up ldscripts and libs |
| 348 |
mkdir -p "${dstlib}" |
| 349 |
@@ -155,16 +149,16 @@ switch_profile() { |
| 350 |
if [[ -d ${ROOT}/${INCPATH} ]] ; then |
| 351 |
cd "${ROOT}/${INCPATH}" || exit 1 |
| 352 |
if [[ ${HOST} == ${TARGET} ]] ; then |
| 353 |
- mkdir -p "${EROOT}/usr/include" |
| 354 |
+ mkdir -p "${ROOT}/usr/include" |
| 355 |
for x in * ; do |
| 356 |
- atomic_ln "${INCPATH}/${x}" "${EROOT}/usr/include" "${x}" |
| 357 |
+ atomic_ln "${INCPATH}/${x}" "${ROOT}/usr/include" "${x}" |
| 358 |
done |
| 359 |
else |
| 360 |
# Clean out old path -- cannot use '-exec {} +' syntax here |
| 361 |
- find . -type f -exec rm -f "${EROOT}/usr/${TARGET}/usr/include/{}" \; |
| 362 |
- rmdir "${EROOT}/usr/${TARGET}/usr/include" >& /dev/null |
| 363 |
- rmdir "${EROOT}/usr/${TARGET}/usr" >& /dev/null |
| 364 |
- rmdir "${EROOT}/usr/${TARGET}" >& /dev/null |
| 365 |
+ find . -type f -exec rm -f "${ROOT}/usr/${TARGET}/usr/include/{}" \; |
| 366 |
+ rmdir "${ROOT}/usr/${TARGET}/usr/include" >& /dev/null |
| 367 |
+ rmdir "${ROOT}/usr/${TARGET}/usr" >& /dev/null |
| 368 |
+ rmdir "${ROOT}/usr/${TARGET}" >& /dev/null |
| 369 |
fi |
| 370 |
fi |
| 371 |
|
| 372 |
@@ -172,20 +166,20 @@ switch_profile() { |
| 373 |
# Make sure proper paths get updated |
| 374 |
# |
| 375 |
if [[ ${TARGET} == ${HOST} ]] ; then |
| 376 |
- DATAPATH="${EPREFIX}"/usr/share/binutils-data/${TARGET}/${VER} |
| 377 |
- local e="${EROOT}"/etc/env.d/05binutils |
| 378 |
+ DATAPATH=/usr/share/binutils-data/${TARGET}/${VER} |
| 379 |
+ local e="${ROOT}"/etc/env.d/05binutils |
| 380 |
local ee="${e}.tmp" |
| 381 |
rm -f "${ee}" |
| 382 |
- [[ -d ${DATAPATH}/man ]] && echo "MANPATH=${DATAPATH}/man" >> "${ee}" |
| 383 |
- [[ -d ${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}" |
| 384 |
+ [[ -d ${ROOT}/${DATAPATH}/man ]] && echo "MANPATH=${DATAPATH}/man" >> "${ee}" |
| 385 |
+ [[ -d ${ROOT}/${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}" |
| 386 |
# hmm, `ld` has this in SEARCH_DIR(), but ld.so does not ... |
| 387 |
- if [[ -d ${EROOT}/etc/ld.so.conf.d ]] ; then |
| 388 |
- local l="${EROOT}"/etc/ld.so.conf.d/05binutils.conf |
| 389 |
+ if [[ -d ${ROOT}/etc/ld.so.conf.d ]] ; then |
| 390 |
+ local l="${ROOT}"/etc/ld.so.conf.d/05binutils.conf |
| 391 |
local ll="${l}.tmp" |
| 392 |
- echo "${EPREFIX}/usr/${TARGET}/lib" > "${ll}" |
| 393 |
+ echo "/usr/${TARGET}/lib" > "${ll}" |
| 394 |
mv_if_diff "${ll}" "${l}" |
| 395 |
else |
| 396 |
- echo "LDPATH=${EPREFIX}/usr/${TARGET}/lib" >> "${ee}" |
| 397 |
+ echo "LDPATH=/usr/${TARGET}/lib" >> "${ee}" |
| 398 |
fi |
| 399 |
mv_if_diff "${ee}" "${e}" |
| 400 |
fi |
| 401 |
@@ -205,7 +199,7 @@ switch_profile() { |
| 402 |
echo |
| 403 |
ewarn "Please remember to run:" |
| 404 |
echo |
| 405 |
- ewarn " # . ${EPREFIX}/etc/profile" |
| 406 |
+ ewarn " # . /etc/profile" |
| 407 |
echo |
| 408 |
fi |
| 409 |
|
| 410 |
@@ -230,7 +224,7 @@ uninstall_target() { |
| 411 |
die "no profiles exist for '${TARGET}'" |
| 412 |
fi |
| 413 |
|
| 414 |
- rm -f "${ENV_D}"/config-${TARGET} "${EROOT}"/etc/ld.so.conf.d/05binutils.conf |
| 415 |
+ rm -f "${ENV_D}"/config-${TARGET} |
| 416 |
|
| 417 |
local x |
| 418 |
for x in \ |
| 419 |
@@ -239,28 +233,28 @@ uninstall_target() { |
| 420 |
nm objcopy objdump ranlib readelf size strings strip |
| 421 |
do |
| 422 |
x=( |
| 423 |
- "${EROOT}"/usr/bin/${TARGET}-${x} |
| 424 |
- "${EROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x} |
| 425 |
- "${EROOT}"/usr/libexec/gcc/${TARGET}/${x} |
| 426 |
+ "${ROOT}"/usr/bin/${TARGET}-${x} |
| 427 |
+ "${ROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x} |
| 428 |
+ "${ROOT}"/usr/libexec/gcc/${TARGET}/${x} |
| 429 |
) |
| 430 |
rm -f "${x[@]}" |
| 431 |
done |
| 432 |
for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do |
| 433 |
- rm -f "${EROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x} |
| 434 |
+ rm -f "${ROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x} |
| 435 |
done |
| 436 |
for x in bfd iberty opcodes ; do |
| 437 |
- rm -f "${EROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la} |
| 438 |
+ rm -f "${ROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la} |
| 439 |
done |
| 440 |
# Delete broken symlinks |
| 441 |
- local destdir="${EROOT}/usr/${HOST}/${TARGET}" |
| 442 |
+ local destdir="${ROOT}/usr/${HOST}/${TARGET}" |
| 443 |
rm -f "${destdir}"/lib/ldscripts |
| 444 |
find -L "${destdir}"/lib -type l -exec rm {} + |
| 445 |
rmdir \ |
| 446 |
"${destdir}"/{bin,include,lib,usr} \ |
| 447 |
"${destdir}" \ |
| 448 |
- "${EROOT}"/var/db/pkg/cross-${TARGET} \ |
| 449 |
- "${EROOT}"/usr/{${HOST}/,}${TARGET}/bin \ |
| 450 |
- "${EROOT}"/usr/libexec/gcc/${TARGET} \ |
| 451 |
+ "${ROOT}"/var/db/pkg/cross-${TARGET} \ |
| 452 |
+ "${ROOT}"/usr/{${HOST}/,}${TARGET}/bin \ |
| 453 |
+ "${ROOT}"/usr/libexec/gcc/${TARGET} \ |
| 454 |
2>/dev/null |
| 455 |
|
| 456 |
rm -f "${ENV_D}"/${TARGET}-* |
| 457 |
@@ -359,7 +353,7 @@ set_HOST() { |
| 458 |
: ${HOST:=${CHOST:-$(portageq envvar CHOST)}} |
| 459 |
} |
| 460 |
|
| 461 |
-ENV_D="${EROOT}etc/env.d/binutils" |
| 462 |
+ENV_D="${ROOT}etc/env.d/binutils" |
| 463 |
|
| 464 |
DEBUG="no" |
| 465 |
NEED_ACTION="yes" |
| 466 |
@@ -390,7 +384,7 @@ while [[ $# -gt 0 ]] ; do |
| 467 |
-h|--help) usage 0 ;; |
| 468 |
-V|--version) |
| 469 |
unset Header |
| 470 |
- cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.1 2014/07/29 11:15:38 vapier Exp $" |
| 471 |
+ cvsver="$Id$" |
| 472 |
cvsver=${cvsver##*binutils-config-} |
| 473 |
bver=${cvsver%%,v *} |
| 474 |
cvsver=${cvsver#* } |
| 475 |
|
| 476 |
diff --git a/sys-devel/binutils-config/files/binutils-config-4 b/sys-devel/binutils-config/files/binutils-config-5 |
| 477 |
similarity index 75% |
| 478 |
copy from sys-devel/binutils-config/files/binutils-config-4 |
| 479 |
copy to sys-devel/binutils-config/files/binutils-config-5 |
| 480 |
index 3bf84fe..3afc963 100755 |
| 481 |
--- a/sys-devel/binutils-config/files/binutils-config-4 |
| 482 |
+++ b/sys-devel/binutils-config/files/binutils-config-5 |
| 483 |
@@ -1,30 +1,24 @@ |
| 484 |
#!/bin/bash |
| 485 |
-# Copyright 1999-2014 Gentoo Foundation |
| 486 |
+# Copyright 1999-2015 Gentoo Foundation |
| 487 |
# Distributed under the terms of the GNU General Public License v2 |
| 488 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.1 2014/07/29 11:15:38 vapier Exp $ |
| 489 |
+# $Id$ |
| 490 |
|
| 491 |
# Format of /etc/env.d/binutils/: |
| 492 |
# config-TARGET: CURRENT=version for TARGET |
| 493 |
# TARGET-VER: has a TARGET and VER variable |
| 494 |
|
| 495 |
-EPREFIX="@GENTOO_PORTAGE_EPREFIX@" |
| 496 |
-if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then |
| 497 |
- EPREFIX="" |
| 498 |
-fi |
| 499 |
- |
| 500 |
: ${ROOT:=/} |
| 501 |
[[ ${ROOT} != */ ]] && ROOT="${ROOT}/" |
| 502 |
[[ ${ROOT} != /* ]] && ROOT="${PWD%/}/${ROOT}" |
| 503 |
|
| 504 |
-EROOT="${ROOT%/}${EPREFIX}/" |
| 505 |
- |
| 506 |
-cd "${EPREFIX}/" |
| 507 |
+cd / |
| 508 |
|
| 509 |
trap ":" INT QUIT TSTP |
| 510 |
|
| 511 |
argv0=${0##*/} |
| 512 |
-source "${EPREFIX}"/etc/init.d/functions.sh || { |
| 513 |
- echo "${argv0}: Could not source ${EPREFIX}/etc/init.d/functions.sh!" 1>&2 |
| 514 |
+FUNCTIONS_SH="/lib/gentoo/functions.sh" |
| 515 |
+source ${FUNCTIONS_SH} || { |
| 516 |
+ echo "${argv0}: Could not source ${FUNCTIONS_SH}!" 1>&2 |
| 517 |
exit 1 |
| 518 |
} |
| 519 |
esyslog() { :; } |
| 520 |
@@ -103,90 +97,104 @@ setup_env() { |
| 521 |
# Newer paths: /usr/${HOST}/${TARGET}/... |
| 522 |
# Older paths: /usr/${TARGET}/... |
| 523 |
# |
| 524 |
- if [[ -d "${EROOT}"/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then |
| 525 |
- BINPATH="${EPREFIX}"/usr/${HOST}/${TARGET}/binutils-bin/${VER} |
| 526 |
- BINPATH_LINKS="${EPREFIX}"/usr/libexec/gcc/${TARGET} |
| 527 |
+ if [[ -d ${ROOT}/usr/${HOST}/${TARGET}/binutils-bin/${VER} ]] ; then |
| 528 |
+ BINPATH=/usr/${HOST}/${TARGET}/binutils-bin/${VER} |
| 529 |
+ BINPATH_LINKS=/usr/libexec/gcc/${TARGET} |
| 530 |
fi |
| 531 |
fi |
| 532 |
if [[ -z ${BINPATH} ]] ; then |
| 533 |
- BINPATH="${EPREFIX}"/usr/${TARGET}/binutils-bin/${VER} |
| 534 |
- BINPATH_LINKS="${EPREFIX}"/usr/${TARGET}/bin |
| 535 |
+ BINPATH=/usr/${TARGET}/binutils-bin/${VER} |
| 536 |
+ BINPATH_LINKS=/usr/${TARGET}/bin |
| 537 |
fi |
| 538 |
} |
| 539 |
|
| 540 |
+# Lists of headers that various versions have installed. |
| 541 |
+HEADERS=( |
| 542 |
+ ansidecl.h bfd.h bfdlink.h demangle.h dis-asm.h dyn-string.h |
| 543 |
+ fibheap.h hashtab.h libiberty.h objalloc.h plugin-api.h |
| 544 |
+ splay-tree.h symcat.h |
| 545 |
+) |
| 546 |
+ |
| 547 |
switch_profile() { |
| 548 |
+ local x |
| 549 |
+ |
| 550 |
ebegin "Switching to ${PROFILE}" |
| 551 |
|
| 552 |
setup_env || return 1 |
| 553 |
|
| 554 |
cd "${ROOT}/${BINPATH}" || exit 1 |
| 555 |
- mkdir -p "${ROOT}/${BINPATH_LINKS}" "${EROOT}/usr/bin" |
| 556 |
+ mkdir -p "${ROOT}/${BINPATH_LINKS}" "${ROOT}/usr/bin" |
| 557 |
for x in * ; do |
| 558 |
atomic_ln "${BINPATH}/${x}" "${ROOT}/${BINPATH_LINKS}" "${x}" |
| 559 |
- atomic_ln "${BINPATH_LINKS}/${x}" "${EROOT}/usr/bin" "${TARGET}-${x}" |
| 560 |
+ atomic_ln "${BINPATH_LINKS}/${x}" "${ROOT}/usr/bin" "${TARGET}-${x}" |
| 561 |
if [[ ${TARGET} == ${HOST} ]] ; then |
| 562 |
- atomic_ln "${TARGET}-${x}" "${EROOT}/usr/bin" "${x}" |
| 563 |
+ atomic_ln "${TARGET}-${x}" "${ROOT}/usr/bin" "${x}" |
| 564 |
fi |
| 565 |
done |
| 566 |
|
| 567 |
# |
| 568 |
# Generate library / ldscripts symlinks |
| 569 |
# |
| 570 |
- : ${LIBPATH:=${EPREFIX}/usr/lib/binutils/${TARGET}/${VER}} |
| 571 |
+ : ${LIBPATH:=/usr/lib/binutils/${TARGET}/${VER}} |
| 572 |
cd "${ROOT}/${LIBPATH}" || exit 1 |
| 573 |
if [[ ${TARGET} == ${HOST} ]] ; then |
| 574 |
- dstlib=${EROOT}/usr/${HOST}/lib |
| 575 |
+ dstlib=${ROOT}/usr/${HOST}/lib |
| 576 |
else |
| 577 |
- dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib |
| 578 |
+ dstlib=${ROOT}/usr/${HOST}/${TARGET}/lib |
| 579 |
fi |
| 580 |
- # When upgrading, we need to clean up ldscripts and libs |
| 581 |
+ # When upgrading, we need to clean up ldscripts and libs. |
| 582 |
+ # Don't symlink back in the libs -- the binutils-lib package handles |
| 583 |
+ # these now. |
| 584 |
+ # TODO: Stop requiring even the ldscripts symlink. |
| 585 |
mkdir -p "${dstlib}" |
| 586 |
rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts |
| 587 |
atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts" |
| 588 |
- find -L "${dstlib}" -type l -exec rm -v {} + |
| 589 |
- for x in lib* ; do |
| 590 |
- atomic_ln "${LIBPATH}/${x}" "${dstlib}" "${x}" |
| 591 |
- done |
| 592 |
+ find -L "${dstlib}" -xtype l -name 'lib*' -exec rm -f {} + |
| 593 |
|
| 594 |
# |
| 595 |
- # Generate include symlinks |
| 596 |
+ # Clean out old generated include symlinks |
| 597 |
# |
| 598 |
INCPATH=${LIBPATH}/include |
| 599 |
if [[ -d ${ROOT}/${INCPATH} ]] ; then |
| 600 |
cd "${ROOT}/${INCPATH}" || exit 1 |
| 601 |
if [[ ${HOST} == ${TARGET} ]] ; then |
| 602 |
- mkdir -p "${EROOT}/usr/include" |
| 603 |
- for x in * ; do |
| 604 |
- atomic_ln "${INCPATH}/${x}" "${EROOT}/usr/include" "${x}" |
| 605 |
+ # The binutils-lib package handles these files now. |
| 606 |
+ for x in libiberty "${HEADERS[@]}" ; do |
| 607 |
+ x="${ROOT}/usr/include/${x}" |
| 608 |
+ if [[ -L ${x} ]] ; then |
| 609 |
+ rm "${x}" |
| 610 |
+ fi |
| 611 |
done |
| 612 |
else |
| 613 |
# Clean out old path -- cannot use '-exec {} +' syntax here |
| 614 |
- find . -type f -exec rm -f "${EROOT}/usr/${TARGET}/usr/include/{}" \; |
| 615 |
- rmdir "${EROOT}/usr/${TARGET}/usr/include" >& /dev/null |
| 616 |
- rmdir "${EROOT}/usr/${TARGET}/usr" >& /dev/null |
| 617 |
- rmdir "${EROOT}/usr/${TARGET}" >& /dev/null |
| 618 |
+ find . -type f -exec rm -f "${ROOT}/usr/${TARGET}/usr/include/{}" \; |
| 619 |
+ rmdir "${ROOT}/usr/${TARGET}/usr/include" >& /dev/null |
| 620 |
+ rmdir "${ROOT}/usr/${TARGET}/usr" >& /dev/null |
| 621 |
+ rmdir "${ROOT}/usr/${TARGET}" >& /dev/null |
| 622 |
fi |
| 623 |
fi |
| 624 |
|
| 625 |
# |
| 626 |
# Make sure proper paths get updated |
| 627 |
# |
| 628 |
+ local env_update_flag="--no-ldconfig" |
| 629 |
if [[ ${TARGET} == ${HOST} ]] ; then |
| 630 |
- DATAPATH="${EPREFIX}"/usr/share/binutils-data/${TARGET}/${VER} |
| 631 |
- local e="${EROOT}"/etc/env.d/05binutils |
| 632 |
+ # Delete old config now that binutils-libs installs these files. |
| 633 |
+ # Note: This skips ldconfig update if env.d had LDPATH, but meh. |
| 634 |
+ # Most people have upgraded to ld.so.conf.d, and someone else will |
| 635 |
+ # eventually re-run ldconfig for us. |
| 636 |
+ x="${ROOT}"/etc/ld.so.conf.d/05binutils.conf |
| 637 |
+ if [[ -e ${x} ]]; then |
| 638 |
+ rm -f "${x}" |
| 639 |
+ env_update_flag="" |
| 640 |
+ fi |
| 641 |
+ |
| 642 |
+ DATAPATH=/usr/share/binutils-data/${TARGET}/${VER} |
| 643 |
+ local e="${ROOT}"/etc/env.d/05binutils |
| 644 |
local ee="${e}.tmp" |
| 645 |
rm -f "${ee}" |
| 646 |
- [[ -d ${DATAPATH}/man ]] && echo "MANPATH=${DATAPATH}/man" >> "${ee}" |
| 647 |
- [[ -d ${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}" |
| 648 |
- # hmm, `ld` has this in SEARCH_DIR(), but ld.so does not ... |
| 649 |
- if [[ -d ${EROOT}/etc/ld.so.conf.d ]] ; then |
| 650 |
- local l="${EROOT}"/etc/ld.so.conf.d/05binutils.conf |
| 651 |
- local ll="${l}.tmp" |
| 652 |
- echo "${EPREFIX}/usr/${TARGET}/lib" > "${ll}" |
| 653 |
- mv_if_diff "${ll}" "${l}" |
| 654 |
- else |
| 655 |
- echo "LDPATH=${EPREFIX}/usr/${TARGET}/lib" >> "${ee}" |
| 656 |
- fi |
| 657 |
+ [[ -d ${ROOT}/${DATAPATH}/man ]] && echo "MANPATH=${DATAPATH}/man" >> "${ee}" |
| 658 |
+ [[ -d ${ROOT}/${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}" |
| 659 |
mv_if_diff "${ee}" "${e}" |
| 660 |
fi |
| 661 |
|
| 662 |
@@ -201,11 +209,11 @@ switch_profile() { |
| 663 |
# Regen env.d if need/can be |
| 664 |
# |
| 665 |
if [[ ${ROOT} == "/" ]] && [[ ${TARGET} == ${HOST} ]] ; then |
| 666 |
- env-update |
| 667 |
+ env-update ${env_update_flag} |
| 668 |
echo |
| 669 |
ewarn "Please remember to run:" |
| 670 |
echo |
| 671 |
- ewarn " # . ${EPREFIX}/etc/profile" |
| 672 |
+ ewarn " # . /etc/profile" |
| 673 |
echo |
| 674 |
fi |
| 675 |
|
| 676 |
@@ -230,7 +238,7 @@ uninstall_target() { |
| 677 |
die "no profiles exist for '${TARGET}'" |
| 678 |
fi |
| 679 |
|
| 680 |
- rm -f "${ENV_D}"/config-${TARGET} "${EROOT}"/etc/ld.so.conf.d/05binutils.conf |
| 681 |
+ rm -f "${ENV_D}"/config-${TARGET} |
| 682 |
|
| 683 |
local x |
| 684 |
for x in \ |
| 685 |
@@ -239,28 +247,28 @@ uninstall_target() { |
| 686 |
nm objcopy objdump ranlib readelf size strings strip |
| 687 |
do |
| 688 |
x=( |
| 689 |
- "${EROOT}"/usr/bin/${TARGET}-${x} |
| 690 |
- "${EROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x} |
| 691 |
- "${EROOT}"/usr/libexec/gcc/${TARGET}/${x} |
| 692 |
+ "${ROOT}"/usr/bin/${TARGET}-${x} |
| 693 |
+ "${ROOT}"/usr/{${HOST}/,}${TARGET}/bin/${x} |
| 694 |
+ "${ROOT}"/usr/libexec/gcc/${TARGET}/${x} |
| 695 |
) |
| 696 |
rm -f "${x[@]}" |
| 697 |
done |
| 698 |
- for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do |
| 699 |
- rm -f "${EROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x} |
| 700 |
+ for x in "${HEADERS[@]}" ; do |
| 701 |
+ rm -f "${ROOT}"/usr/{${HOST}/,}${TARGET}/{usr/,}include/${x} |
| 702 |
done |
| 703 |
for x in bfd iberty opcodes ; do |
| 704 |
- rm -f "${EROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la} |
| 705 |
+ rm -f "${ROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la} |
| 706 |
done |
| 707 |
# Delete broken symlinks |
| 708 |
- local destdir="${EROOT}/usr/${HOST}/${TARGET}" |
| 709 |
+ local destdir="${ROOT}/usr/${HOST}/${TARGET}" |
| 710 |
rm -f "${destdir}"/lib/ldscripts |
| 711 |
find -L "${destdir}"/lib -type l -exec rm {} + |
| 712 |
rmdir \ |
| 713 |
"${destdir}"/{bin,include,lib,usr} \ |
| 714 |
"${destdir}" \ |
| 715 |
- "${EROOT}"/var/db/pkg/cross-${TARGET} \ |
| 716 |
- "${EROOT}"/usr/{${HOST}/,}${TARGET}/bin \ |
| 717 |
- "${EROOT}"/usr/libexec/gcc/${TARGET} \ |
| 718 |
+ "${ROOT}"/var/db/pkg/cross-${TARGET} \ |
| 719 |
+ "${ROOT}"/usr/{${HOST}/,}${TARGET}/bin \ |
| 720 |
+ "${ROOT}"/usr/libexec/gcc/${TARGET} \ |
| 721 |
2>/dev/null |
| 722 |
|
| 723 |
rm -f "${ENV_D}"/${TARGET}-* |
| 724 |
@@ -359,7 +367,7 @@ set_HOST() { |
| 725 |
: ${HOST:=${CHOST:-$(portageq envvar CHOST)}} |
| 726 |
} |
| 727 |
|
| 728 |
-ENV_D="${EROOT}etc/env.d/binutils" |
| 729 |
+ENV_D="${ROOT}etc/env.d/binutils" |
| 730 |
|
| 731 |
DEBUG="no" |
| 732 |
NEED_ACTION="yes" |
| 733 |
@@ -390,7 +398,7 @@ while [[ $# -gt 0 ]] ; do |
| 734 |
-h|--help) usage 0 ;; |
| 735 |
-V|--version) |
| 736 |
unset Header |
| 737 |
- cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.1 2014/07/29 11:15:38 vapier Exp $" |
| 738 |
+ cvsver="$Id$" |
| 739 |
cvsver=${cvsver##*binutils-config-} |
| 740 |
bver=${cvsver%%,v *} |
| 741 |
cvsver=${cvsver#* } |
| 742 |
|
| 743 |
diff --git a/sys-devel/binutils-config/files/binutils.eselect b/sys-devel/binutils-config/files/binutils.eselect |
| 744 |
new file mode 100644 |
| 745 |
index 0000000..a89655a |
| 746 |
--- /dev/null |
| 747 |
+++ b/sys-devel/binutils-config/files/binutils.eselect |
| 748 |
@@ -0,0 +1,45 @@ |
| 749 |
+# -*-eselect-*- vim: ft=eselect |
| 750 |
+# Copyright 2005-2015 Gentoo Foundation |
| 751 |
+# Distributed under the terms of the GNU GPL version 2 or later |
| 752 |
+ |
| 753 |
+DESCRIPTION="Manage installed versions of sys-devel/binutils" |
| 754 |
+MAINTAINER="toolchain@g.o" |
| 755 |
+ |
| 756 |
+### list action |
| 757 |
+ |
| 758 |
+describe_list() { |
| 759 |
+ echo "List all installed version of binutils" |
| 760 |
+} |
| 761 |
+ |
| 762 |
+do_list() { |
| 763 |
+ binutils-config -l |
| 764 |
+} |
| 765 |
+ |
| 766 |
+### set action |
| 767 |
+ |
| 768 |
+describe_set() { |
| 769 |
+ echo "Activate one of the installed binutils" |
| 770 |
+} |
| 771 |
+ |
| 772 |
+describe_set_parameters() { |
| 773 |
+ echo "<target>" |
| 774 |
+} |
| 775 |
+ |
| 776 |
+describe_set_options() { |
| 777 |
+ echo "target : Target name or number (from 'list' action)" |
| 778 |
+} |
| 779 |
+ |
| 780 |
+do_set() { |
| 781 |
+ [[ $# -eq 1 ]] || die -q "Please specify exactly one version to activate!" |
| 782 |
+ binutils-config "$1" |
| 783 |
+} |
| 784 |
+ |
| 785 |
+### show action |
| 786 |
+ |
| 787 |
+describe_show() { |
| 788 |
+ echo "Print the currently active binutils version" |
| 789 |
+} |
| 790 |
+ |
| 791 |
+do_show() { |
| 792 |
+ binutils-config -c |
| 793 |
+} |
Archives