From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 654FC158094 for ; Fri, 26 Aug 2022 06:36:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 641AFE088F; Fri, 26 Aug 2022 06:36:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 42212E088F for ; Fri, 26 Aug 2022 06:36:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F3B1340ED1 for ; Fri, 26 Aug 2022 06:36:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 496E1599 for ; Fri, 26 Aug 2022 06:36:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1661495739.c0703fef2220d392cd1b35fa8b02a0fb09826563.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild sys-libs/ncurses/ncurses-6.3_p20220423.ebuild X-VCS-Directories: sys-libs/ncurses/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c0703fef2220d392cd1b35fa8b02a0fb09826563 X-VCS-Branch: master Date: Fri, 26 Aug 2022 06:36:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ef45fb3f-aa84-4565-afd1-a059c5acb8a1 X-Archives-Hash: 88531d9d58d7f36fdb57746307bbb36d commit: c0703fef2220d392cd1b35fa8b02a0fb09826563 Author: Sam James gentoo org> AuthorDate: Fri Aug 26 06:20:48 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Aug 26 06:35:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0703fef sys-libs/ncurses: don't call LD & pkg-config directly Bug: https://lists.gnu.org/archive/html/bug-ncurses/2022-08/msg00024.html Closes: https://bugs.gentoo.org/866398 Thanks-to: Allen Webb google.com> Signed-off-by: Sam James gentoo.org> sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild | 16 +++++++++++----- sys-libs/ncurses/ncurses-6.3_p20220423.ebuild | 16 +++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild index 1a8b50aab67f..f7f4f7c7d153 100644 --- a/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild +++ b/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild @@ -22,6 +22,10 @@ if [[ ${PV} == *_p* ]] ; then # "At times (generally to mark a relatively stable point), I create a rollup # patch, which consists of all changes from the release through the current date." # + # Also, from https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html, + # the patches are considered to be acceptable to use after some testing. They + # are both for development but also bug fixes. + # # This array should contain a list of all the snapshots since the last # release if there's no megapatch available yet. PATCH_DATES=( @@ -120,6 +124,12 @@ src_configure() { # bug #214642 BUILD_CPPFLAGS+=" -D_GNU_SOURCE" + # Should be fixed upstream soon: + # https://lists.gnu.org/archive/html/bug-ncurses/2022-08/msg00024.html + # bug #866398 + sed -i -e 's/ld --verbose/${LD} --verbose/' configure || die + sed -i -e 's/pkg-config --version/${PKG_CONFIG} --version/' misc/gen-pkgconfig.in || die + # Build the various variants of ncurses -- narrow, wide, and threaded. #510440 # Order matters here -- we want unicode/thread versions to come last so that the # binaries in /usr/bin support both wide and narrow. @@ -258,11 +268,7 @@ do_configure() { [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" fi - # Force bash until upstream rebuilds the configure script with a newer - # version of autotools. bug #545532 - #CONFIG_SHELL=${EPREFIX}/bin/bash \ - ECONF_SOURCE="${S}" \ - econf "${conf[@]}" "$@" + ECONF_SOURCE="${S}" econf "${conf[@]}" "$@" } src_compile() { diff --git a/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild index 4b4374096d7a..223791bd1371 100644 --- a/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild +++ b/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild @@ -22,6 +22,10 @@ if [[ ${PV} == *_p* ]] ; then # "At times (generally to mark a relatively stable point), I create a rollup # patch, which consists of all changes from the release through the current date." # + # Also, from https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html, + # the patches are considered to be acceptable to use after some testing. They + # are both for development but also bug fixes. + # # This array should contain a list of all the snapshots since the last # release if there's no megapatch available yet. PATCH_DATES=( @@ -120,6 +124,12 @@ src_configure() { # bug #214642 BUILD_CPPFLAGS+=" -D_GNU_SOURCE" + # Should be fixed upstream soon: + # https://lists.gnu.org/archive/html/bug-ncurses/2022-08/msg00024.html + # bug #866398 + sed -i -e 's/ld --verbose/${LD} --verbose/' configure || die + sed -i -e 's/pkg-config --version/${PKG_CONFIG} --version/' misc/gen-pkgconfig.in || die + # Build the various variants of ncurses -- narrow, wide, and threaded. #510440 # Order matters here -- we want unicode/thread versions to come last so that the # binaries in /usr/bin support both wide and narrow. @@ -258,11 +268,7 @@ do_configure() { [[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic" fi - # Force bash until upstream rebuilds the configure script with a newer - # version of autotools. bug #545532 - #CONFIG_SHELL=${EPREFIX}/bin/bash \ - ECONF_SOURCE="${S}" \ - econf "${conf[@]}" "$@" + ECONF_SOURCE="${S}" econf "${conf[@]}" "$@" } src_compile() {