diff options
Diffstat (limited to 'sys-devel/binutils')
-rw-r--r-- | sys-devel/binutils/Manifest | 5 | ||||
-rw-r--r-- | sys-devel/binutils/binutils-2.30-r2.ebuild | 2 | ||||
-rw-r--r-- | sys-devel/binutils/binutils-9999.ebuild | 37 |
3 files changed, 23 insertions, 21 deletions
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest index 51bb963a24b9..8e628dde02af 100644 --- a/sys-devel/binutils/Manifest +++ b/sys-devel/binutils/Manifest @@ -13,12 +13,13 @@ DIST binutils-2.29.1.tar.bz2 29123355 BLAKE2B 83de518a27bae0f13c57b1979493dd7f7c DIST binutils-2.30-patches-2.tar.xz 490272 BLAKE2B a28a5b5bb8faa33fec269f2c69d6ed0e4e7d5a9169861aa4b3c45511794e1e749c216862a8258c2029f1b40c511dcb2a0aeaecda57e75d52418f10d6f345718f SHA512 1686d5b58ee968f2000647acab2bee4c263d1c85fd43fed8c820fccfc0d7024a01211e7853cd5ce452fa90da500bc17309edf6dbc901c7fd6fc7b3e3d6f42581 DIST binutils-2.30-patches-3.tar.xz 548804 BLAKE2B 428a1750233ae3f019e20cb5ed1d8e6fe6455181e8f5961dbfe7b66493d1c42050f889e45c02c1fc1a84d545c9e61f81ad6ffd5afc0b1099a702ccc7637c3abe SHA512 c91e902d1d9fc2e9782df04c93173c3207c771f1c063e2ff12c9336593c954ea3f1b2474a8fc045927d72fe18f7401874059599d100c4a1fd152081f05913d03 DIST binutils-2.30.tar.xz 20286700 BLAKE2B 2dd5436a15a601011a1950e6082ec00082f5916fb82ce95ceab424fd8dc19f6daa7ac32a149f222ccdcc603354165cc206fde070eaa44fe2cc5e57486efc7868 SHA512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839 +DIST binutils-9999-patches-1.tar.xz 10116 BLAKE2B 1ae970fd13ea1b94f554ed5b3fde4b6bdd90efcfc2488efc2f1465511279027c2e7f2a7371069afadb91bf833680a24e1a5df50d3169c9ee132c933b3c1fdba9 SHA512 a5d97d7070b876bf072db2a99a2876c239e03409849b9c93467bd3e70cd97c468110031a09e1c182c05d48004ec3e1651f44a1850b0275a385c3bae598cd98d7 EBUILD binutils-2.25.1-r1.ebuild 280 BLAKE2B 6c3abc3c6b80becab91ec1f2c88c1f5dba11e862035355a9ce2c029b865865ca58c359f25496c50aa63cadb3ca08de77eb2a86c2d2286441870f65a7a943b42a SHA512 4cc55460454f6ae62fb900bdbce4896279dd27dfc5b09126d8942675970776cafccdd6d7adfdfba74862ee2e84ad7d2be9b7ddc79319a6dfc09b745e16b18a54 EBUILD binutils-2.26.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d EBUILD binutils-2.27-r1.ebuild 293 BLAKE2B 750c39e7ba698916b54eadd97e36fa8b84c9aaa547bcd671deaff719e9d95e66265a12c7845ea7a98de4337263230ac69f0f634c29a6bead78fa13820dca280f SHA512 4137e36156afbfd4ddc6ba08b6fc94e37556375c42f77e21d72d8338e55af094ef28bcbdfcf2c686232b5932208562f38b64db8638d2199ecfc2465518544267 EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289 -EBUILD binutils-2.30-r2.ebuild 11860 BLAKE2B cd7004b73bffcff8f86fb480060a409f72d8bf211e552779caaf3d897b842d5ec4ea653780b6bc7e5a2f14540458907af6c6b1385bcbb78c7d5d7b45a5eb8c39 SHA512 398a95f3f73b1b5c9f0397a9c3cc7d79b325ab1b62f17f3df78cd6dcebd4fbeaf437f7c07f9966c5944c2c4fd7ab797b23c279d80f5226ad4b58e7dfab7c6e38 +EBUILD binutils-2.30-r2.ebuild 11859 BLAKE2B 186e120d4a7324abca1efa6a5892981adb21ef942a31dfb27c4bb95e14810f187494c7b47e29444aa602063063b6218d245c971a4f997e1cfb4f91d882495887 SHA512 b248bc442207e58407a36d3477afb25b55baa1d158c9820b75973de1909b7117fbc66ddad4eae219115d7fba345fec1de02850e53d591820444e20860c3a61b0 EBUILD binutils-2.30-r3.ebuild 11864 BLAKE2B 18001b8d905368b565e15ab852cb0e18a3354cfc31db5f3799b0d84ab837dabc50a7e0bb2656622c972fb46525b8007fe641f4ef76e837006791ecca9aa46131 SHA512 ddeedc8aa8c1a72ea16855c15e4660e5db335b8d50e45444233c755928eb9138168819e7ea9998759e71dd6582b296445679333363e0f5abe62788d17417999f -EBUILD binutils-9999.ebuild 11665 BLAKE2B e2db3d6e08d5ad51b485f62b08fbc43a5440299a9e92bbcbee18143c4f31e1f2035d58fd4479bff28985fa5e0c69293631a36bee475e4ee94a6c3c01149dd55d SHA512 08172266dac34ff37dfa143c13734d5a9d4a5eb0fca572b3ab47123403c728c01b75afe9f83fb4edafe6f309b45123cb5a3d44c617b824900388a7f0ab88e6b1 +EBUILD binutils-9999.ebuild 11632 BLAKE2B 781ab5ed40b3f13d82a25a6b01de1c4a5b9c20080ee23c1fcb6d2d7f43d28604a302f71a80d9c5c0d141c8b10dfe88812ccdc4c60124ad854a75060bd490fe4e SHA512 7bfe7bb543edfed031dce5be1ef74dc54b81aa15c02b07d3adc0e6169f87711edb217d604b8ea1c3954cbd8cc5a59f2ad98ace1159b950c03b9eb97e0f89f3f8 MISC metadata.xml 447 BLAKE2B 78d0b6e0a34f19d0f90f568fb84fcddbc995eb2c64f9c4feef2545d49322311fc6825b3b208dc03718bd75d550581efbdc9ee26e7f7a6f856902e640f90bf0f5 SHA512 73cb18db3a677767a78d5cab44ca721083ef17b4a158c10a66a186835b57a3d763b6f6753c836620b32ec912834ae8da2148c8fa0e4932170956b92c75169a9d diff --git a/sys-devel/binutils/binutils-2.30-r2.ebuild b/sys-devel/binutils/binutils-2.30-r2.ebuild index d88d5caf9dd3..bd063c2a5f4e 100644 --- a/sys-devel/binutils/binutils-2.30-r2.ebuild +++ b/sys-devel/binutils/binutils-2.30-r2.ebuild @@ -35,7 +35,7 @@ case ${PV} in ;; esac SLOT="${BVER}" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" # # The Gentoo patchset diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild index d7ba7c31aa75..c7972aa0b704 100644 --- a/sys-devel/binutils/binutils-9999.ebuild +++ b/sys-devel/binutils/binutils-9999.ebuild @@ -19,25 +19,25 @@ IUSE="+cxx doc multitarget +nls static-libs test" # for the patchsets # Default: dilfridge :) +PATCH_VER=1 + case ${PV} in 9999) - BVER="git" EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" inherit git-r3 S=${WORKDIR}/binutils EGIT_CHECKOUT_DIR=${S} ;; *) - BVER=${PV} - SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.xz" + SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz" ;; esac -SLOT="${BVER}" +SLOT="${PV}" # # The Gentoo patchset # -PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${BVER}} +PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} PATCH_DEV=${PATCH_DEV:-dilfridge} [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} @@ -80,7 +80,8 @@ MY_BUILDDIR=${WORKDIR}/build src_unpack() { case ${PV} in 9999) - git-r3_src_unpack; + git-r3_src_unpack + default ;; *) default @@ -136,21 +137,21 @@ toolchain-binutils_bugurl() { printf "https://bugs.gentoo.org/" } toolchain-binutils_pkgversion() { - printf "Gentoo ${BVER}" + printf "Gentoo ${PV}" [[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}" } src_configure() { # Setup some paths - LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER} + LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV} INCPATH=${LIBPATH}/include - DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER} + DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV} if is_cross ; then TOOLPATH=/usr/${CHOST}/${CTARGET} else TOOLPATH=/usr/${CTARGET} fi - BINPATH=${TOOLPATH}/binutils-bin/${BVER} + BINPATH=${TOOLPATH}/binutils-bin/${PV} # Make sure we filter $LINGUAS so that only ones that # actually work make it through #42033 @@ -282,7 +283,7 @@ src_install() { # Newer versions of binutils get fancy with ${LIBPATH} #171905 cd "${ED}"/${LIBPATH} for d in ../* ; do - [[ ${d} == ../${BVER} ]] && continue + [[ ${d} == ../${PV} ]] && continue mv ${d}/* . || die rmdir ${d} || die done @@ -323,10 +324,10 @@ src_install() { insinto /etc/env.d/binutils cat <<-EOF > "${T}"/env.d TARGET="${CTARGET}" - VER="${BVER}" + VER="${PV}" LIBPATH="${EPREFIX}${LIBPATH}" EOF - newins "${T}"/env.d ${CTARGET}-${BVER} + newins "${T}"/env.d ${CTARGET}-${PV} # Handle documentation if ! is_cross ; then @@ -358,7 +359,7 @@ src_install() { pkg_postinst() { # Make sure this ${CTARGET} has a binutils version selected [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 - binutils-config ${CTARGET}-${BVER} + binutils-config ${CTARGET}-${PV} } pkg_postrm() { @@ -370,7 +371,7 @@ pkg_postrm() { # rerun binutils-config if this is a remerge, as # we want the mtimes on the symlinks updated (if # it is the same as the current selected profile) - if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then + if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') choice=${choice//$'\n'/ } choice=${choice/* } @@ -379,8 +380,8 @@ pkg_postrm() { else binutils-config ${choice} fi - elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then - binutils-config ${CTARGET}-${BVER} + elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then + binutils-config ${CTARGET}-${PV} fi } @@ -410,4 +411,4 @@ pkg_postrm() { # - at build-time set scriptdir to point to symlinked location: # ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case) # - at install-time set scriptdir to point to slotted location: -# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${BVER} +# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV} |