diff options
Diffstat (limited to 'sys-devel/binutils-hppa64')
| -rw-r--r-- | sys-devel/binutils-hppa64/Manifest | 6 | ||||
| -rw-r--r-- | sys-devel/binutils-hppa64/binutils-hppa64-2.37_p1.ebuild (renamed from sys-devel/binutils-hppa64/binutils-hppa64-2.37.ebuild) | 101 |
2 files changed, 65 insertions, 42 deletions
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest index 82900ca87ae3..2269e0618c38 100644 --- a/sys-devel/binutils-hppa64/Manifest +++ b/sys-devel/binutils-hppa64/Manifest @@ -2,9 +2,9 @@ DIST binutils-2.35.2-patches-1.tar.xz 11836 BLAKE2B 0141349c9618992d1ab1e0309f7e DIST binutils-2.35.2.tar.xz 22056908 BLAKE2B 9c392e0db2b482442f9476f30bd80cf2796321cbf7be79cf21af7bef167b6074c4ae009dcf9b438d2f2f4a23381c935176b2cfa85de1a526ab46e0fd844a7ca5 SHA512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 DIST binutils-2.36.1-patches-5.tar.xz 44388 BLAKE2B 1dadb012fe35ec5fb0c5a15d348ab535bc5e3765375c97a3768c6b9f7126e0fda15d35163c9f9c33a4be98662dd120d7c1b21930a20c18dbb5345f56ecd9ecc1 SHA512 a2ce3388f1f1a77ff865481ff4b625121fd55f5234fed0a885312744f2f9c504717de1499b68252c6de64fa45866db7692df91c5838b43fbeb178938811cbe84 DIST binutils-2.36.1.tar.xz 22772248 BLAKE2B 03fbfbedd6dba2beaa836b1ed254eddd7a54a163d3061fd93edd2b9591cae24ba049b26658c524b5ccecc2f22d431dfa168218d2531aa356945c994fbbe896fa SHA512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 -DIST binutils-2.37-patches-2.tar.xz 79304 BLAKE2B bdcbe29efba3582f2d1be9057a39aedb655cbc225abe8ea656c1bcf090a53930c74197505c8de2dcfd9a105f1b1cc8fa84a0d532547221d2df34a77b06e7fa15 SHA512 5cea876cfbdcd1409f5ef8ee138a8c29ad5b3d38b5d72ce312f2eb94fb8b2165e9a10018c46bdc36bc59ade2e2764e5da4ac653d15690bfc0bc9784202cc0164 -DIST binutils-2.37.tar.xz 22916924 BLAKE2B f5a374fdf0300f7734d1e462333296b16c9d5ed6eba167e1742a4da7082f4388c929e286bf76c3933b3e434937380340732a31790723654b491ea0c8ab5b9ba5 SHA512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 +DIST binutils-2.37_p1-patches-0.tar.xz 1392 BLAKE2B 128930a381022fea5d1fcb0695953e8dada2513b088b8540fe08d4e0da93ec18b6bf9c78acad6ec5a8982ae2c115d143462ef0bb7bfd63cfeb06c10ad472c2f8 SHA512 44666821f96349e96685ffcfd53a80a94659e38fc63eeeb980d0eed13aab03ae3e2d5059b4932cd9018f2f7698cdb5e15b443d60c01b2bd1385eeb0c698e0e24 +DIST binutils-2.37_p1.tar.xz 22992196 BLAKE2B a8aa0f386d03a5b1466166ac7c40989c228351ccf0949a9b462b4d4615d70ab7e1a45351299140a42baf39c317b8007733c253eb547ee1dfadb612addde11621 SHA512 46c297ec2a7a5b81d1c6e3f16486a6dc2860a07520fe2dd8871d1eb5160065bbe2cc6b0415d5352bf12284133e5817a4e429e6077182d615e969bd1a8f52ed28 EBUILD binutils-hppa64-2.35.2.ebuild 12393 BLAKE2B 7c6521094cd088a4d9ddab7391c2994e9506a53083a269d1fcee519f5ad8ded88e53d6957656ba5287643c17a87ae7c584e49771aa635d573f40ff3c060c153d SHA512 5855d3967d920f93ed177626a9eb64348e951341751d42b3d67b98dacedea9b250473a5e3baee3d08510a8a3d2f8340ba775ee71207df125d1490b4a23dea281 EBUILD binutils-hppa64-2.36.1-r2.ebuild 12394 BLAKE2B de0c3d4769e6f059de888475b266b0bdf26b27ae05d5f2441548051ef360f7e5ca0a06776507f771772e022c183a7eeed9eeaf8a1e9ff92ef947b3568f907a5d SHA512 8decd31c9b4aeacef4e369692c6e5dd7a6bf5a9223f11ce828742cfdcc229d3e6502187bb28d70814ee0e6b273d415c11b017338daa13b3da0ec3f34fce67bf0 -EBUILD binutils-hppa64-2.37.ebuild 12395 BLAKE2B edc7271d3c2b1785b6469d029e2bd9fd7fbdd6072eab5a9815d87643f74ec9fda7c8df1abf09a208826e5968a0f5c2d1a3f7b8e357ac2d1f72d0d7aac2e820c9 SHA512 52d33540efc4541d321ab4e50b2cba7fe0d33812987490f71c97e1560004c635a8c3a75f0498400759baa6b21374140236b2838d61361c0d19a5702025124d48 +EBUILD binutils-hppa64-2.37_p1.ebuild 13225 BLAKE2B ff9460eba089ee56c786a6d7025ef3af9011b0fc02caece9f0bfc5829450f19ae8537327059a06848ca1ccb6330a5d06611621b598dd9824103a829c0ae70533 SHA512 aa2dcd650c999d13bc8dcfc6d61c4d1be66bc542cbfcfb9842a3d50dacd68a95fb7f12983e03b9c4eaa1d17a6161aa3920911902f3f589fd9384a050341e7d35 MISC metadata.xml 767 BLAKE2B 1b1533f4fce4b4ea9e2bebbe19c55d55d226120dd255fa421b46971ac554696209fa9df92e40279561876895392827415ee77f7502fec5b0ac684a60f0697de6 SHA512 3aa7ebfd1f6efc14d1d6b19406e08c100854c1e1b933cd8682e90825e8fcb71ec3086e2772422931fe88797c1b54d02422e0700488637f6bd594bf6d1d6181a9 diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.37.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.37_p1.ebuild index cb0769ff3b02..6477736ca7c9 100644 --- a/sys-devel/binutils-hppa64/binutils-hppa64-2.37.ebuild +++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.37_p1.ebuild @@ -10,10 +10,10 @@ inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs DESCRIPTION="Tools necessary to build programs" HOMEPAGE="https://sourceware.org/binutils/" LICENSE="GPL-3+" -IUSE="cet default-gold doc +gold multitarget +nls +plugins static-libs test" +IUSE="cet default-gold doc +gold multitarget +nls +plugins static-libs test vanilla" REQUIRED_USE="default-gold? ( gold )" -# Variables that can be set here: +# Variables that can be set here (ignored for live ebuilds) # PATCH_VER - the patchset version # Default: empty, no patching # PATCH_BINUTILS_VER - the binutils version in the patchset name @@ -21,32 +21,22 @@ REQUIRED_USE="default-gold? ( gold )" # PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/... # for the patchsets -PATCH_VER=2 +PATCH_VER=0 PATCH_DEV=dilfridge -case ${PV} in - 9999) - EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" - inherit git-r3 - S=${WORKDIR}/binutils - EGIT_CHECKOUT_DIR=${S} - SLOT=${PV} - ;; - *) - SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz" - SLOT=$(ver_cut 1-2) - #KEYWORDS="-* ~hppa" - ;; -esac - -# -# The Gentoo patchset -# -PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} -PATCH_DEV=${PATCH_DEV:-slyfox} - -[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} - https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + SLOT=${PV} +else + PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} + PATCH_DEV=${PATCH_DEV:-dilfridge} + SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz" + [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" + SLOT=$(ver_cut 1-2) + # live ebuild + KEYWORDS="-* ~hppa" +fi # # The cross-compile logic @@ -69,7 +59,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" doc? ( sys-apps/texinfo ) - test? ( dev-util/dejagnu ) + test? ( + dev-util/dejagnu + sys-devel/bc + ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc @@ -81,21 +74,44 @@ MY_BUILDDIR=${WORKDIR}/build S=${WORKDIR}/${P/-hppa64/} src_unpack() { - case ${PV} in - *9999) - git-r3_src_unpack - ;; - *) - ;; - esac - default - mkdir -p "${MY_BUILDDIR}" + if [[ ${PV} == 9999* ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git + git-r3_src_unpack + mv patches-git/9999 patch || die + + EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" + S=${WORKDIR}/binutils + EGIT_CHECKOUT_DIR=${S} + git-r3_src_unpack + else + unpack ${P}.tar.xz + + cd "${WORKDIR}" || die + unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz + + # _p patch versions are Gentoo specific tarballs ... + S=${WORKDIR}/${P%_p?} + fi + + cd "${WORKDIR}" || die + mkdir -p "${MY_BUILDDIR}" || die } src_prepare() { - if [[ ! -z ${PATCH_VER} ]] ; then - einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}" - eapply "${WORKDIR}/patch"/*.patch + local patchsetname + if [[ ${PV} == 9999* ]] ; then + patchsetname="from git master" + else + patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}" + fi + + if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then + if ! use vanilla; then + einfo "Applying binutils patchset ${patchsetname}" + eapply "${WORKDIR}/patch" + einfo "Done." + fi fi # This check should probably go somewhere else, like pkg_pretend. @@ -236,6 +252,10 @@ src_configure() { --enable-relro # Newer versions (>=2.24) make this an explicit option. #497268 --enable-install-libiberty + # Available from 2.35 on + --enable-textrel-check=warning + # Works better than vapier's patch... #808787 + --enable-new-dtags --disable-werror --with-bugurl="$(toolchain-binutils_bugurl)" --with-pkgversion="$(toolchain-binutils_pkgversion)" @@ -287,8 +307,10 @@ src_compile() { src_test() { cd "${MY_BUILDDIR}" + # bug 637066 filter-flags -Wall -Wreturn-type + emake -k check } @@ -410,6 +432,7 @@ pkg_postrm() { binutils-config ${CTARGET}-${PV} fi } + # Note [slotting support] # ----------------------- # Gentoo's layout for binutils files is non-standard as Gentoo |