| 1 |
commit: 78f470be1ec0d6908f205e3e859f80c15ad157b2 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 16 01:43:36 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 16 01:43:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78f470be |
| 7 |
|
| 8 |
sys-devel/binutils: sync template with -hppa64 |
| 9 |
|
| 10 |
See: e2d2448a60d4872646acbe9f1dd389e1f1950231 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-devel/binutils/binutils-2.37_p1.ebuild | 7 +++++-- |
| 14 |
sys-devel/binutils/binutils-9999.ebuild | 9 ++++++--- |
| 15 |
2 files changed, 11 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-devel/binutils/binutils-2.37_p1.ebuild b/sys-devel/binutils/binutils-2.37_p1.ebuild |
| 18 |
index 5d38540bceb..5ee7334398a 100644 |
| 19 |
--- a/sys-devel/binutils/binutils-2.37_p1.ebuild |
| 20 |
+++ b/sys-devel/binutils/binutils-2.37_p1.ebuild |
| 21 |
@@ -82,13 +82,16 @@ src_unpack() { |
| 22 |
EGIT_CHECKOUT_DIR=${S} |
| 23 |
git-r3_src_unpack |
| 24 |
else |
| 25 |
- unpack ${P}.tar.xz |
| 26 |
+ unpack ${P/-hppa64/}.tar.xz |
| 27 |
|
| 28 |
cd "${WORKDIR}" || die |
| 29 |
unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz |
| 30 |
|
| 31 |
# _p patch versions are Gentoo specific tarballs ... |
| 32 |
- S=${WORKDIR}/${P%_p?} |
| 33 |
+ local dir=${P%_p?} |
| 34 |
+ dir=${dir/-hppa64/} |
| 35 |
+ |
| 36 |
+ S=${WORKDIR}/${dir} |
| 37 |
fi |
| 38 |
|
| 39 |
cd "${WORKDIR}" || die |
| 40 |
|
| 41 |
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild |
| 42 |
index 37d8a9fa13f..8394f7f945e 100644 |
| 43 |
--- a/sys-devel/binutils/binutils-9999.ebuild |
| 44 |
+++ b/sys-devel/binutils/binutils-9999.ebuild |
| 45 |
@@ -19,7 +19,7 @@ REQUIRED_USE="default-gold? ( gold )" |
| 46 |
# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/... |
| 47 |
# for the patchsets |
| 48 |
|
| 49 |
-PATCH_VER=1 |
| 50 |
+PATCH_VER=0 |
| 51 |
PATCH_DEV=dilfridge |
| 52 |
|
| 53 |
if [[ ${PV} == 9999* ]]; then |
| 54 |
@@ -82,13 +82,16 @@ src_unpack() { |
| 55 |
EGIT_CHECKOUT_DIR=${S} |
| 56 |
git-r3_src_unpack |
| 57 |
else |
| 58 |
- unpack ${P}.tar.xz |
| 59 |
+ unpack ${P/-hppa64/}.tar.xz |
| 60 |
|
| 61 |
cd "${WORKDIR}" || die |
| 62 |
unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz |
| 63 |
|
| 64 |
# _p patch versions are Gentoo specific tarballs ... |
| 65 |
- S=${WORKDIR}/${P%_p?} |
| 66 |
+ local dir=${P%_p?} |
| 67 |
+ dir=${dir/-hppa64/} |
| 68 |
+ |
| 69 |
+ S=${WORKDIR}/${dir} |
| 70 |
fi |
| 71 |
|
| 72 |
cd "${WORKDIR}" || die |
Archives