| 1 |
commit: 168e3783ac7ee8d1fd40e43cb9a0debc5585148a |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 25 00:35:58 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 26 05:48:02 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168e3783 |
| 7 |
|
| 8 |
sys-devel/binutils-hppa64: use econf |
| 9 |
|
| 10 |
Sync more with binutils-libs by using econf instead of raw ./configure call; |
| 11 |
means we benefit from some of the default arguments it passes, in particular |
| 12 |
thinking of silent rules which upstream are starting to support more now too |
| 13 |
(and enable by default) which econf disables. |
| 14 |
|
| 15 |
Also, we use it fine in binutils-libs w/o issue. |
| 16 |
|
| 17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 18 |
|
| 19 |
.../binutils-hppa64/binutils-hppa64-2.38-r2.ebuild | 20 +++++++++----------- |
| 20 |
1 file changed, 9 insertions(+), 11 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.38-r2.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.38-r2.ebuild |
| 23 |
index abe6f85f3a2b..cfb3450416da 100644 |
| 24 |
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.38-r2.ebuild |
| 25 |
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.38-r2.ebuild |
| 26 |
@@ -70,19 +70,19 @@ BDEPEND=" |
| 27 |
|
| 28 |
RESTRICT="!test? ( test )" |
| 29 |
|
| 30 |
-MY_BUILDDIR=${WORKDIR}/build |
| 31 |
-S=${WORKDIR}/${P/-hppa64/} |
| 32 |
+MY_BUILDDIR="${WORKDIR}"/build |
| 33 |
+S="${WORKDIR}"/${P/-hppa64/} |
| 34 |
|
| 35 |
src_unpack() { |
| 36 |
if [[ ${PV} == 9999* ]] ; then |
| 37 |
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git" |
| 38 |
- EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git |
| 39 |
+ EGIT_CHECKOUT_DIR="${WORKDIR}"/patches-git |
| 40 |
git-r3_src_unpack |
| 41 |
mv patches-git/9999 patch || die |
| 42 |
|
| 43 |
+ S="${WORKDIR}"/binutils |
| 44 |
EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" |
| 45 |
- S=${WORKDIR}/binutils |
| 46 |
- EGIT_CHECKOUT_DIR=${S} |
| 47 |
+ EGIT_CHECKOUT_DIR="${S}" |
| 48 |
git-r3_src_unpack |
| 49 |
else |
| 50 |
unpack ${P/-hppa64/}.tar.xz |
| 51 |
@@ -94,7 +94,7 @@ src_unpack() { |
| 52 |
local dir=${P%_p?} |
| 53 |
dir=${dir/-hppa64/} |
| 54 |
|
| 55 |
- S=${WORKDIR}/${dir} |
| 56 |
+ S="${WORKDIR}"/${dir} |
| 57 |
fi |
| 58 |
|
| 59 |
cd "${WORKDIR}" || die |
| 60 |
@@ -178,7 +178,7 @@ src_configure() { |
| 61 |
done |
| 62 |
echo |
| 63 |
|
| 64 |
- cd "${MY_BUILDDIR}" |
| 65 |
+ cd "${MY_BUILDDIR}" || die |
| 66 |
local myconf=() |
| 67 |
|
| 68 |
if use plugins ; then |
| 69 |
@@ -251,7 +251,6 @@ src_configure() { |
| 70 |
--with-bugurl="$(toolchain-binutils_bugurl)" |
| 71 |
--with-pkgversion="$(toolchain-binutils_pkgversion)" |
| 72 |
$(use_enable static-libs static) |
| 73 |
- ${EXTRA_ECONF} |
| 74 |
# Disable modules that are in a combined binutils/gdb tree. bug #490566 |
| 75 |
--disable-{gdb,libdecnumber,readline,sim} |
| 76 |
# Strip out broken static link flags. |
| 77 |
@@ -281,8 +280,7 @@ src_configure() { |
| 78 |
fi |
| 79 |
fi |
| 80 |
|
| 81 |
- echo ./configure "${myconf[@]}" |
| 82 |
- "${S}"/configure "${myconf[@]}" || die |
| 83 |
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" || die |
| 84 |
|
| 85 |
# Prevent makeinfo from running if doc is unset. |
| 86 |
if ! use doc ; then |
| 87 |
@@ -309,7 +307,7 @@ src_compile() { |
| 88 |
} |
| 89 |
|
| 90 |
src_test() { |
| 91 |
- cd "${MY_BUILDDIR}" |
| 92 |
+ cd "${MY_BUILDDIR}" || die |
| 93 |
|
| 94 |
# bug #637066 |
| 95 |
filter-flags -Wall -Wreturn-type |
Archives