| 1 |
commit: c0703fef2220d392cd1b35fa8b02a0fb09826563 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 26 06:20:48 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 26 06:35:39 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0703fef |
| 7 |
|
| 8 |
sys-libs/ncurses: don't call LD & pkg-config directly |
| 9 |
|
| 10 |
Bug: https://lists.gnu.org/archive/html/bug-ncurses/2022-08/msg00024.html |
| 11 |
Closes: https://bugs.gentoo.org/866398 |
| 12 |
Thanks-to: Allen Webb <allenwebb <AT> google.com> |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild | 16 +++++++++++----- |
| 16 |
sys-libs/ncurses/ncurses-6.3_p20220423.ebuild | 16 +++++++++++----- |
| 17 |
2 files changed, 22 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild |
| 20 |
index 1a8b50aab67f..f7f4f7c7d153 100644 |
| 21 |
--- a/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild |
| 22 |
+++ b/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild |
| 23 |
@@ -22,6 +22,10 @@ if [[ ${PV} == *_p* ]] ; then |
| 24 |
# "At times (generally to mark a relatively stable point), I create a rollup |
| 25 |
# patch, which consists of all changes from the release through the current date." |
| 26 |
# |
| 27 |
+ # Also, from https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html, |
| 28 |
+ # the patches are considered to be acceptable to use after some testing. They |
| 29 |
+ # are both for development but also bug fixes. |
| 30 |
+ # |
| 31 |
# This array should contain a list of all the snapshots since the last |
| 32 |
# release if there's no megapatch available yet. |
| 33 |
PATCH_DATES=( |
| 34 |
@@ -120,6 +124,12 @@ src_configure() { |
| 35 |
# bug #214642 |
| 36 |
BUILD_CPPFLAGS+=" -D_GNU_SOURCE" |
| 37 |
|
| 38 |
+ # Should be fixed upstream soon: |
| 39 |
+ # https://lists.gnu.org/archive/html/bug-ncurses/2022-08/msg00024.html |
| 40 |
+ # bug #866398 |
| 41 |
+ sed -i -e 's/ld --verbose/${LD} --verbose/' configure || die |
| 42 |
+ sed -i -e 's/pkg-config --version/${PKG_CONFIG} --version/' misc/gen-pkgconfig.in || die |
| 43 |
+ |
| 44 |
# Build the various variants of ncurses -- narrow, wide, and threaded. #510440 |
| 45 |
# Order matters here -- we want unicode/thread versions to come last so that the |
| 46 |
# binaries in /usr/bin support both wide and narrow. |
| 47 |
@@ -258,11 +268,7 @@ do_configure() { |
| 48 |
[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" |
| 49 |
fi |
| 50 |
|
| 51 |
- # Force bash until upstream rebuilds the configure script with a newer |
| 52 |
- # version of autotools. bug #545532 |
| 53 |
- #CONFIG_SHELL=${EPREFIX}/bin/bash \ |
| 54 |
- ECONF_SOURCE="${S}" \ |
| 55 |
- econf "${conf[@]}" "$@" |
| 56 |
+ ECONF_SOURCE="${S}" econf "${conf[@]}" "$@" |
| 57 |
} |
| 58 |
|
| 59 |
src_compile() { |
| 60 |
|
| 61 |
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild |
| 62 |
index 4b4374096d7a..223791bd1371 100644 |
| 63 |
--- a/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild |
| 64 |
+++ b/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild |
| 65 |
@@ -22,6 +22,10 @@ if [[ ${PV} == *_p* ]] ; then |
| 66 |
# "At times (generally to mark a relatively stable point), I create a rollup |
| 67 |
# patch, which consists of all changes from the release through the current date." |
| 68 |
# |
| 69 |
+ # Also, from https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html, |
| 70 |
+ # the patches are considered to be acceptable to use after some testing. They |
| 71 |
+ # are both for development but also bug fixes. |
| 72 |
+ # |
| 73 |
# This array should contain a list of all the snapshots since the last |
| 74 |
# release if there's no megapatch available yet. |
| 75 |
PATCH_DATES=( |
| 76 |
@@ -120,6 +124,12 @@ src_configure() { |
| 77 |
# bug #214642 |
| 78 |
BUILD_CPPFLAGS+=" -D_GNU_SOURCE" |
| 79 |
|
| 80 |
+ # Should be fixed upstream soon: |
| 81 |
+ # https://lists.gnu.org/archive/html/bug-ncurses/2022-08/msg00024.html |
| 82 |
+ # bug #866398 |
| 83 |
+ sed -i -e 's/ld --verbose/${LD} --verbose/' configure || die |
| 84 |
+ sed -i -e 's/pkg-config --version/${PKG_CONFIG} --version/' misc/gen-pkgconfig.in || die |
| 85 |
+ |
| 86 |
# Build the various variants of ncurses -- narrow, wide, and threaded. #510440 |
| 87 |
# Order matters here -- we want unicode/thread versions to come last so that the |
| 88 |
# binaries in /usr/bin support both wide and narrow. |
| 89 |
@@ -258,11 +268,7 @@ do_configure() { |
| 90 |
[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" |
| 91 |
fi |
| 92 |
|
| 93 |
- # Force bash until upstream rebuilds the configure script with a newer |
| 94 |
- # version of autotools. bug #545532 |
| 95 |
- #CONFIG_SHELL=${EPREFIX}/bin/bash \ |
| 96 |
- ECONF_SOURCE="${S}" \ |
| 97 |
- econf "${conf[@]}" "$@" |
| 98 |
+ ECONF_SOURCE="${S}" econf "${conf[@]}" "$@" |
| 99 |
} |
| 100 |
|
| 101 |
src_compile() { |
Archives