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 E25C615800F for ; Wed, 22 Feb 2023 07:42:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38ABFE077C; Wed, 22 Feb 2023 07:42:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E09A5E077A for ; Wed, 22 Feb 2023 07:42:46 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 045EF34072E for ; Wed, 22 Feb 2023 07:42:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A821475 for ; Wed, 22 Feb 2023 07:42:43 +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: <1677051737.82564c2f5d5f46e6e7bb0c082f98f39071e2b75d.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_p20221203-r2.ebuild sys-libs/ncurses/ncurses-6.4.ebuild X-VCS-Directories: sys-libs/ncurses/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 82564c2f5d5f46e6e7bb0c082f98f39071e2b75d X-VCS-Branch: master Date: Wed, 22 Feb 2023 07:42:43 +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: 2c28ea8c-8830-497c-a89f-184b76f72dda X-Archives-Hash: 93049127388b0b63d03b5b0ae5ab4775 commit: 82564c2f5d5f46e6e7bb0c082f98f39071e2b75d Author: Peter Foley pefoley com> AuthorDate: Wed Feb 22 03:56:25 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Feb 22 07:42:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82564c2f sys-libs/ncurses: Fix cygwin build Force -DBUILDING_NCURCES for build tools to avoid dllimport errors. Update tic build to use get_exeext, which fixes native builds. Bug: https://bugs.gentoo.org/852665 Signed-off-by: Peter Foley pefoley.com> Closes: https://github.com/gentoo/gentoo/pull/29713 Signed-off-by: Sam James gentoo.org> sys-libs/ncurses/ncurses-6.3_p20221203-r2.ebuild | 21 ++++++++------------- sys-libs/ncurses/ncurses-6.4.ebuild | 19 +++++++------------ 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/sys-libs/ncurses/ncurses-6.3_p20221203-r2.ebuild b/sys-libs/ncurses/ncurses-6.3_p20221203-r2.ebuild index 3dc71f8201ae..406b0ca3cb24 100644 --- a/sys-libs/ncurses/ncurses-6.3_p20221203-r2.ebuild +++ b/sys-libs/ncurses/ncurses-6.3_p20221203-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc -inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript verify-sig +inherit flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript verify-sig MY_PV="${PV:0:3}" MY_P="${PN}-${MY_PV}" @@ -198,6 +198,11 @@ src_configure() { # bug #214642 BUILD_CPPFLAGS+=" -D_GNU_SOURCE" + # bug #852665 + if [[ ${CHOST} == *-cygwin* ]]; then + BUILD_CPPFLAGS+=" -DBUILDING_NCURSES" + fi + # 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. @@ -348,17 +353,7 @@ do_configure() { src_compile() { # See comments in src_configure. if ! has_version -b "~sys-libs/${P}:0" ; then - # We could possibly merge these two branches but opting to be - # conservative when merging some of the Prefix changes. - - if [[ ${CHOST} == *-cygwin* ]] && ! multilib_is_native_abi ; then - # We make 'tic$(x)' here, for Cygwin having x=".exe". - BUILD_DIR="${WORKDIR}" \ - do_compile cross -C progs all PROGS='tic$(x)' - else - BUILD_DIR="${WORKDIR}" \ - do_compile cross -C progs tic - fi + BUILD_DIR="${WORKDIR}" do_compile cross -C progs tic$(get_exeext) fi multilib-minimal_src_compile diff --git a/sys-libs/ncurses/ncurses-6.4.ebuild b/sys-libs/ncurses/ncurses-6.4.ebuild index 2bbacd762737..58a97be7ee7d 100644 --- a/sys-libs/ncurses/ncurses-6.4.ebuild +++ b/sys-libs/ncurses/ncurses-6.4.ebuild @@ -4,7 +4,7 @@ EAPI=7 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc -inherit flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript verify-sig +inherit flag-o-matic toolchain-funcs multilib multilib-minimal preserve-libs usr-ldscript verify-sig MY_PV="${PV:0:3}" MY_P="${PN}-${MY_PV}" @@ -142,6 +142,11 @@ src_configure() { # bug #214642 BUILD_CPPFLAGS+=" -D_GNU_SOURCE" + # bug #852665 + if [[ ${CHOST} == *-cygwin* ]]; then + BUILD_CPPFLAGS+=" -DBUILDING_NCURSES" + fi + # 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. @@ -288,17 +293,7 @@ do_configure() { src_compile() { # See comments in src_configure. if ! has_version -b "~sys-libs/${P}:0" ; then - # We could possibly merge these two branches but opting to be - # conservative when merging some of the Prefix changes. - - if [[ ${CHOST} == *-cygwin* ]] && ! multilib_is_native_abi ; then - # We make 'tic$(x)' here, for Cygwin having x=".exe". - BUILD_DIR="${WORKDIR}" \ - do_compile cross -C progs all PROGS='tic$(x)' - else - BUILD_DIR="${WORKDIR}" \ - do_compile cross -C progs tic - fi + BUILD_DIR="${WORKDIR}" do_compile cross -C progs tic$(get_exeext) fi multilib-minimal_src_compile