diff options
Diffstat (limited to 'sys-devel/binutils-hppa64')
| -rw-r--r-- | sys-devel/binutils-hppa64/Manifest | 7 | ||||
| -rw-r--r-- | sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r6.ebuild (renamed from sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r3.ebuild) | 104 | ||||
| -rw-r--r-- | sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild (renamed from sys-devel/binutils-hppa64/binutils-hppa64-2.32.ebuild) | 4 |
3 files changed, 84 insertions, 31 deletions
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest index 3f10d875244b..307dba93c76b 100644 --- a/sys-devel/binutils-hppa64/Manifest +++ b/sys-devel/binutils-hppa64/Manifest @@ -15,8 +15,9 @@ DIST binutils-2.29.tar.bz2 29073316 BLAKE2B 0eb7bbefa1ac5f4d753ca9328d339a466d4f DIST binutils-2.30-patches-5.tar.xz 590864 BLAKE2B 71de4d08f92ab1898ad576a21763f955067cbbed543250888e0c5d51f4ef77d0d829049e9a835691cf2de03965fbcc9bcfa092eb304c03f9b885e7a3dadab286 SHA512 029b3be6ae9b8620f8580a35701bd4517b4e0232ff3cf9983b3808475c7443cbf500b6cace2c052df0bd1e47202838f4d2453238db28709a947117071d9ae804 DIST binutils-2.30.tar.xz 20286700 BLAKE2B 2dd5436a15a601011a1950e6082ec00082f5916fb82ce95ceab424fd8dc19f6daa7ac32a149f222ccdcc603354165cc206fde070eaa44fe2cc5e57486efc7868 SHA512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839 DIST binutils-2.31.1-patches-5.tar.xz 65896 BLAKE2B 7fb2c4c71336a77f3fef57a0430c511ef7326f8196d8f3a57a6d56aed464953172eeb0755f020387739cf27f709d0bc3de9c3c8b972a94f1480639465158e180 SHA512 c254f22b8ca662cf49cd5fc076d3e9b82d7f421420408c960c54310fc49462600325e7bc50f863cab7c8c49caebac3ac353dc24ab5947e8f01b98c11f43f57d2 +DIST binutils-2.31.1-patches-7.tar.xz 76828 BLAKE2B 354e7c3aa76c0cfe8fc6bb419a5b19294c0be09ebdff2fc4533dd16116fcd4f4a1b4c8db02233dabe33ca68347e0a30e542456988a4ead407edb47ed031e018c SHA512 c84ff9cd9f5b1e313e93d0f25bb4244950a73e0d97ec4dacb8763382219a08a01b16a8e93173032232ea4239098b29448331ed461f792e663e1117eb0811f85b DIST binutils-2.31.1.tar.xz 20467996 BLAKE2B 6b914df1fbb7cf54f2159f71b2c2b09f3f6a569b7a3cb4cf9790d0a3733a7548bc0ea32334a178ed3b56e8b97656ae99c7abaf212601beeaeae9a0884c0f6051 SHA512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30 -DIST binutils-2.32-patches-1.tar.xz 93252 BLAKE2B 80d229be60c3377fe52ff3e74ee911b5dcfb9456d3f42a57662fbda3184ac1c63e698e592f804ac05c459527d0cd4bae7d8c9ef8caef02fdf4f17aa783f4ff81 SHA512 69999f60d89589dcf9e3cb18e50f153ab4ce05bdf3f3758fa322b5c4cb468aeda46c416da540995ddff1ea5e96354c264fa5ff0156c53685816d35117eb481e0 +DIST binutils-2.32-patches-2.tar.xz 145672 BLAKE2B 8218e621f99cb4bcd1638c3011449b94480d207eaeb79cf75c0072e0f1a86bfd1603fc4515bc40d3ac1921a18b9a211b20568f59b11b13eb44e6cff1329c5af9 SHA512 55c25a603f6175af3ade6848e5c1faba06a147d72e9a4f53d44502d97db76499485a67b278a654d18884714a7bf7b360c77c9e42dba3cdc188f805bfe461f09f DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a EBUILD binutils-hppa64-2.25.1.ebuild 649 BLAKE2B 46ddf5d41f1a24566dcb4ea8d935d45267bbe2b437c3ad0c4ec7302acf463ffe818c96d15aa55a2606d74486bbce3418b86fda08b19ed7eef47252fe3e948724 SHA512 8061b215177024cd77e73cf1897a83bf353f7cff162f035ddfc983d1d2f6c1fecb3b5bc0e4275889b45e450ec98133e8d90e9dacd305c101b1cf6002090fb682 EBUILD binutils-hppa64-2.26.1.ebuild 649 BLAKE2B 7634f79d45f03490a2c5f336fec707880792966bafc8ee07ebc0bf5102d2ba1be51a1a4123b415d6e5e28fee784fbb2fdb86d7cd68a873f941c67286f7edf779 SHA512 8174c2a92d336ecd685eab3a2680bcadd30d7d15205b441d179ade7d3f2e87862062115a45d7ab1e7ab8fe811530f47584ca34d2a2157c09be7468386bfa5d16 @@ -27,7 +28,7 @@ EBUILD binutils-hppa64-2.29.1-r1.ebuild 647 BLAKE2B c17820e537f67c2a26af197ee7eb EBUILD binutils-hppa64-2.29.1.ebuild 676 BLAKE2B bf9da84ae57d3756e147bd875941758139551f3c0a61bc011109d33a26364a9e9d02ec4307679c849be2441864c8bad09463cee247f99f58a437f98dbf720f38 SHA512 435494d643ec9d50aa584df181a44bb386a993c78e34152d931f435fb60df9868c5c87a16cdcd24d5556056351d114375cc0d8e2d46e1d1fac9b3b81da7a3db8 EBUILD binutils-hppa64-2.29.ebuild 650 BLAKE2B d5fe2e9a8c5fc3d906838e6c0621329e0082d4705d222a2c4d513bcbaf4e5e6cc64582ea8a8e41ae1deda4d8651bc299892990dcf15670eb8fb5248ea9b8333f SHA512 7786209f9e2c4e1fa40ec08b8a4ff1c89d1471a2f438a7b750cb4067b19520a1a9b9be0c46396b2e0d0b9ad4c0f2d82cbacf4e77397661b04d49da45ebac70fa EBUILD binutils-hppa64-2.30-r4.ebuild 10860 BLAKE2B ad84a88ebe8268f180c1aaedae6f9bf14bffe1b1ae699e05f294c7602eb84731cb450c38918b5a5d1f0f5a6c980a39f2f54d2de6a26eb1340a014c3a874c3b13 SHA512 53edc88591545db03c95d7f308987fe6c4f139a8dbcf62e5c8563037682199593c6298267835a8611ed77dfd491e25fd586ecd31057f095e0adf03a7185f0341 -EBUILD binutils-hppa64-2.31.1-r3.ebuild 10645 BLAKE2B cb4b9242ddd58330c4a1448a34e53ab0a7f6e2592f09a4b5a4a2a5f656365cfe4e75696dc3c73f76777749bcc8ce103a54e0ac79ae1ddda508edfffcb2b782d0 SHA512 b415e963eda1ee896118a3eee793c483951dea1fd164133d86f4a3d76bb817a99152995be81b2274296aa272478679e03414a38b7dafed26337945e52e2b87bb EBUILD binutils-hppa64-2.31.1-r4.ebuild 12532 BLAKE2B 97c95f77b09b46c3626639f93be64957e6794e90baf19685ee735e62745321559b7abfd49701f198ca4e484bc53d70a6cf698f5d2e83053ecccd7da8281316c5 SHA512 dd35a9374978cb8cff929f955a8e2d78cae76d3779b945afe5499ecc5a0eab988fc81dbafa3275271f26fa5dd6a9dcfa88e072e6363204ef235f55ae46bd3093 -EBUILD binutils-hppa64-2.32.ebuild 12609 BLAKE2B 0a04b2806639e032e104c400c852fd56a0d40979051726ed6b85353c89f44449574cd3a3b7811c1f5412ebff769df9d64e1038dcc246be6782b5f9728d744b50 SHA512 3016869fe5eed1ebe3c0bf4726a5bd68b08e3027b57c08079aae70051995596292a21440d74f12b4293857275bec438c8a8bdafc71f4b3849cf70e989f84a8e4 +EBUILD binutils-hppa64-2.31.1-r6.ebuild 12532 BLAKE2B f5926e79abb3e3f2dcf3b01cf4a62ab5975591203df1dbb62fcb899b5fd719826a37bc35d80c9367f1a4e168db9f078384100f2a17b134645ceabae79520b767 SHA512 698134acf8194ab90257ed01ff27676d1152a263baa42052080f0637326105b93410ec7ce8622a7ca24d38d18cc23fe57fbb9b60fcb1ecdc3c74af488216683a +EBUILD binutils-hppa64-2.32-r1.ebuild 12612 BLAKE2B 89b11b0cddb0f32f22b0b591ffbf66830768aa727b0362a26365785954a4a3d1c6c48a975d30a750f216bffd27459d39053baef7fc2065d26c68feee51a5c14c SHA512 915c2cded7f5ce465aad6a3f24e0516eeb2c41250893cc80ec4a35e2c2afcadf347ca1c0cfa8908bd3408568b9ebdcdfb56e5d4735d89a3248561db1ca373b4c MISC metadata.xml 766 BLAKE2B e03336034fccf22a9cd0559a1a78bcc99f7cec05b7e526798e739a48589d50732d1664c6d9fcffe6defcd18840e612cba1a158e557785423d4834c2c54183579 SHA512 ea6c1bc005fecf24c4673f623b6d21ded664e5999720c6b74ad2a3654c40a274c9003a2a44dd402de3317a1d3d4450bc1d3c74683b3a98557363d62e21043e04 diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r3.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r6.ebuild index c1874b7e156b..4db8f750bef6 100644 --- a/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r3.ebuild +++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,10 @@ inherit eutils libtool flag-o-matic gnuconfig multilib versionator DESCRIPTION="Tools necessary to build programs" HOMEPAGE="https://sourceware.org/binutils/" LICENSE="GPL-3+" -IUSE="+cxx doc multitarget +nls static-libs test" +# USE="+cxx" is a transitional flag until llvm migrates to new flags: +# bug #677888 +IUSE="+cxx default-gold doc +gold multitarget +nls +plugins static-libs test" +REQUIRED_USE="cxx? ( gold plugins ) default-gold? ( gold )" # Variables that can be set here: # PATCH_VER - the patchset version @@ -21,20 +24,29 @@ IUSE="+cxx doc multitarget +nls static-libs test" # for the patchsets # Default: slyfox -PATCH_VER=5 +PATCH_VER=7 PATCH_DEV=dilfridge 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} + SLOT=${PV} + ;; + *.9999) + EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" + inherit git-r3 + S=${WORKDIR}/binutils + EGIT_CHECKOUT_DIR=${S} + EGIT_BRANCH=$(get_version_component_range 1-2) + EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch" + SLOT=$(get_version_component_range 1-2) ;; *) - BVER=${PV} - SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${BVER}.tar.xz" + SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz" + SLOT=$(get_version_component_range 1-2) ;; esac SLOT=$(get_version_component_range 1-2) @@ -43,7 +55,7 @@ KEYWORDS="-* ~hppa" # # The Gentoo patchset # -PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${BVER}} +PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} PATCH_DEV=${PATCH_DEV:-slyfox} [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} @@ -80,13 +92,13 @@ S=${WORKDIR}/${P/-hppa64/} src_unpack() { case ${PV} in - 9999) - git-r3_src_unpack; + *9999) + git-r3_src_unpack ;; *) - default ;; esac + default mkdir -p "${MY_BUILDDIR}" } @@ -137,20 +149,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 - BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${BVER} + TOOLPATH=/usr/${CHOST}/${CTARGET} else - BINPATH=/usr/${CTARGET}/binutils-bin/${BVER} + TOOLPATH=/usr/${CTARGET} fi + BINPATH=${TOOLPATH}/binutils-bin/${PV} # Make sure we filter $LINGUAS so that only ones that # actually work make it through #42033 @@ -169,10 +182,15 @@ src_configure() { cd "${MY_BUILDDIR}" local myconf=() + if use plugins ; then + myconf+=( --enable-plugins ) + fi # enable gold (installed as ld.gold) and ld's plugin architecture - if use cxx ; then + if use gold ; then myconf+=( --enable-gold ) - myconf+=( --enable-plugins ) + if use default-gold; then + myconf+=( --enable-gold=default ) + fi fi if use nls ; then @@ -255,7 +273,8 @@ src_configure() { src_compile() { cd "${MY_BUILDDIR}" - emake all + # see Note [tooldir hack for ldscripts] + emake tooldir="${EPREFIX}${TOOLPATH}" all # only build info pages if the user wants them if use doc ; then @@ -269,6 +288,10 @@ src_compile() { src_test() { cd "${MY_BUILDDIR}" + + # bug 637066 + filter-flags -Wall -Wreturn-type + emake -k check } @@ -276,6 +299,7 @@ src_install() { local x d cd "${MY_BUILDDIR}" + # see Note [tooldir hack for ldscripts] emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install rm -rf "${ED}"/${LIBPATH}/bin use static-libs || find "${ED}" -name '*.la' -delete @@ -283,7 +307,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 @@ -324,10 +348,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,13 +382,13 @@ src_install() { # the hppa64 hack; this should go into 9999 as a PN-conditional # tweak the default fake list a little bit cd "${D}"/etc/env.d/binutils - sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${BVER} || die + sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die } 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() { @@ -376,7 +400,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/* } @@ -385,7 +409,35 @@ 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 } + +# Note [slotting support] +# ----------------------- +# Gentoo's layout for binutils files is non-standard as Gentoo +# supports slotted installation for binutils. Many tools +# still expect binutils to reside in known locations. +# binutils-config package restores symlinks into known locations, +# like: +# /usr/bin/${CTARGET}-<tool> +# /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips +# /usr/include/ +# +# Note [tooldir hack for ldscripts] +# --------------------------------- +# Build system does not allow ./configure to tweak every location +# we need for slotting binutils hence all the shuffling in +# src_install(). This note is about SCRIPTDIR define handling. +# +# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value +# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib' +# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time. +# Thus we can't just move files around after compilation finished. +# +# Our goal is the following: +# - 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}/${PV} diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.32.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild index f5b56078a4e1..a2955689dfc1 100644 --- a/sys-devel/binutils-hppa64/binutils-hppa64-2.32.ebuild +++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild @@ -24,8 +24,8 @@ REQUIRED_USE="cxx? ( gold plugins ) default-gold? ( gold )" # for the patchsets # Default: slyfox -PATCH_VER=1 -PATCH_DEV=slyfox +PATCH_VER=2 +PATCH_DEV=dilfridge case ${PV} in 9999) |