summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-09-16 02:43:36 +0100
committerSam James <sam@gentoo.org>2021-09-16 02:43:36 +0100
commit78f470be1ec0d6908f205e3e859f80c15ad157b2 (patch)
tree10315053a6233c7b6b8d044f9069cecce25d6135 /sys-devel
parentsci-libs/fftw: add 3.3.10, sync live (diff)
downloadgentoo-78f470be1ec0d6908f205e3e859f80c15ad157b2.tar.gz
gentoo-78f470be1ec0d6908f205e3e859f80c15ad157b2.tar.bz2
gentoo-78f470be1ec0d6908f205e3e859f80c15ad157b2.zip
sys-devel/binutils: sync template with -hppa64
See: e2d2448a60d4872646acbe9f1dd389e1f1950231 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/binutils/binutils-2.37_p1.ebuild7
-rw-r--r--sys-devel/binutils/binutils-9999.ebuild9
2 files changed, 11 insertions, 5 deletions
diff --git a/sys-devel/binutils/binutils-2.37_p1.ebuild b/sys-devel/binutils/binutils-2.37_p1.ebuild
index 5d38540bceb2..5ee7334398a5 100644
--- a/sys-devel/binutils/binutils-2.37_p1.ebuild
+++ b/sys-devel/binutils/binutils-2.37_p1.ebuild
@@ -82,13 +82,16 @@ src_unpack() {
EGIT_CHECKOUT_DIR=${S}
git-r3_src_unpack
else
- unpack ${P}.tar.xz
+ unpack ${P/-hppa64/}.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?}
+ local dir=${P%_p?}
+ dir=${dir/-hppa64/}
+
+ S=${WORKDIR}/${dir}
fi
cd "${WORKDIR}" || die
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 37d8a9fa13f0..8394f7f945ea 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="default-gold? ( gold )"
# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
# for the patchsets
-PATCH_VER=1
+PATCH_VER=0
PATCH_DEV=dilfridge
if [[ ${PV} == 9999* ]]; then
@@ -82,13 +82,16 @@ src_unpack() {
EGIT_CHECKOUT_DIR=${S}
git-r3_src_unpack
else
- unpack ${P}.tar.xz
+ unpack ${P/-hppa64/}.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?}
+ local dir=${P%_p?}
+ dir=${dir/-hppa64/}
+
+ S=${WORKDIR}/${dir}
fi
cd "${WORKDIR}" || die