From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1454449-garchives=archives.gentoo.org@lists.gentoo.org> 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 5A88C158020 for <garchives@archives.gentoo.org>; Mon, 7 Nov 2022 08:03:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88FF0E09C9; Mon, 7 Nov 2022 08:03:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 729C1E09C9 for <gentoo-commits@lists.gentoo.org>; Mon, 7 Nov 2022 08:03:12 +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 97F7733BF5B for <gentoo-commits@lists.gentoo.org>; Mon, 7 Nov 2022 08:03:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D328E622 for <gentoo-commits@lists.gentoo.org>; Mon, 7 Nov 2022 08:03:09 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1667807869.e5cb1ccc95873d55f9f643b043f3f7493fd31eee.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/python/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/python/python-3.10.8_p2.ebuild dev-lang/python/python-3.11.0_p1.ebuild dev-lang/python/python-3.12.0_alpha1_p1.ebuild dev-lang/python/python-3.8.15_p2.ebuild dev-lang/python/python-3.9.15_p2.ebuild X-VCS-Directories: dev-lang/python/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e5cb1ccc95873d55f9f643b043f3f7493fd31eee X-VCS-Branch: master Date: Mon, 7 Nov 2022 08:03:09 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fefb4687-e7ce-4d34-ba3b-5941b0e170d2 X-Archives-Hash: c2da6fd1800ff679c056c8ab92b97a75 commit: e5cb1ccc95873d55f9f643b043f3f7493fd31eee Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Nov 7 07:57:49 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 7 07:57:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5cb1ccc dev-lang/python: append ncurses include path after CBUILD Python is built We don't want to contaminate the mini CBUILD Python cross build with paths in SYSROOT. Bug: https://bugs.gentoo.org/880059 Bug: https://bugs.gentoo.org/880137 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-lang/python/python-3.10.8_p2.ebuild | 10 +++++----- dev-lang/python/python-3.11.0_p1.ebuild | 10 +++++----- dev-lang/python/python-3.12.0_alpha1_p1.ebuild | 10 +++++----- dev-lang/python/python-3.8.15_p2.ebuild | 10 +++++----- dev-lang/python/python-3.9.15_p2.ebuild | 10 +++++----- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dev-lang/python/python-3.10.8_p2.ebuild b/dev-lang/python/python-3.10.8_p2.ebuild index b1ce528e225d..9430e1042550 100644 --- a/dev-lang/python/python-3.10.8_p2.ebuild +++ b/dev-lang/python/python-3.10.8_p2.ebuild @@ -166,11 +166,6 @@ src_configure() { # PKG_CONFIG needed for cross. tc-export CXX PKG_CONFIG - # Fix implicit declarations on cross and prefix builds. Bug #674070. - if use ncurses; then - append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw - fi - local dbmliborder= if use gdbm; then dbmliborder+="${dbmliborder:+:}gdbm" @@ -289,6 +284,11 @@ src_configure() { local -x LDFLAGS_NODIST=${LDFLAGS} local -x CFLAGS= LDFLAGS= + # Fix implicit declarations on cross and prefix builds. Bug #674070. + if use ncurses; then + append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + fi + econf "${myeconfargs[@]}" if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then diff --git a/dev-lang/python/python-3.11.0_p1.ebuild b/dev-lang/python/python-3.11.0_p1.ebuild index b13b791e8dff..261ca987064c 100644 --- a/dev-lang/python/python-3.11.0_p1.ebuild +++ b/dev-lang/python/python-3.11.0_p1.ebuild @@ -153,11 +153,6 @@ src_configure() { # PKG_CONFIG needed for cross. tc-export CXX PKG_CONFIG - # Fix implicit declarations on cross and prefix builds. Bug #674070. - if use ncurses; then - append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw - fi - local dbmliborder= if use gdbm; then dbmliborder+="${dbmliborder:+:}gdbm" @@ -281,6 +276,11 @@ src_configure() { local -x LDFLAGS_NODIST=${LDFLAGS} local -x CFLAGS= LDFLAGS= + # Fix implicit declarations on cross and prefix builds. Bug #674070. + if use ncurses; then + append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + fi + econf "${myeconfargs[@]}" if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then diff --git a/dev-lang/python/python-3.12.0_alpha1_p1.ebuild b/dev-lang/python/python-3.12.0_alpha1_p1.ebuild index 8d748fa37b67..15f03994af05 100644 --- a/dev-lang/python/python-3.12.0_alpha1_p1.ebuild +++ b/dev-lang/python/python-3.12.0_alpha1_p1.ebuild @@ -149,11 +149,6 @@ src_configure() { # PKG_CONFIG needed for cross. tc-export CXX PKG_CONFIG - # Fix implicit declarations on cross and prefix builds. Bug #674070. - if use ncurses; then - append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw - fi - local dbmliborder= if use gdbm; then dbmliborder+="${dbmliborder:+:}gdbm" @@ -270,6 +265,11 @@ src_configure() { popd &> /dev/null || die fi + # Fix implicit declarations on cross and prefix builds. Bug #674070. + if use ncurses; then + append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + fi + econf "${myeconfargs[@]}" if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then diff --git a/dev-lang/python/python-3.8.15_p2.ebuild b/dev-lang/python/python-3.8.15_p2.ebuild index f03d22173cd6..649ae9032e52 100644 --- a/dev-lang/python/python-3.8.15_p2.ebuild +++ b/dev-lang/python/python-3.8.15_p2.ebuild @@ -152,11 +152,6 @@ src_configure() { # PKG_CONFIG needed for cross. tc-export CXX PKG_CONFIG - # Fix implicit declarations on cross and prefix builds. Bug #674070. - if use ncurses; then - append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw - fi - local dbmliborder= if use gdbm; then dbmliborder+="${dbmliborder:+:}gdbm" @@ -242,6 +237,11 @@ src_configure() { local -x LDFLAGS_NODIST=${LDFLAGS} local -x CFLAGS= LDFLAGS= + # Fix implicit declarations on cross and prefix builds. Bug #674070. + if use ncurses; then + append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + fi + econf "${myeconfargs[@]}" if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then diff --git a/dev-lang/python/python-3.9.15_p2.ebuild b/dev-lang/python/python-3.9.15_p2.ebuild index d5d9a2e273eb..b55a6f73b915 100644 --- a/dev-lang/python/python-3.9.15_p2.ebuild +++ b/dev-lang/python/python-3.9.15_p2.ebuild @@ -162,11 +162,6 @@ src_configure() { # PKG_CONFIG needed for cross. tc-export CXX PKG_CONFIG - # Fix implicit declarations on cross and prefix builds. Bug #674070. - if use ncurses; then - append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw - fi - local dbmliborder= if use gdbm; then dbmliborder+="${dbmliborder:+:}gdbm" @@ -283,6 +278,11 @@ src_configure() { local -x LDFLAGS_NODIST=${LDFLAGS} local -x CFLAGS= LDFLAGS= + # Fix implicit declarations on cross and prefix builds. Bug #674070. + if use ncurses; then + append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + fi + econf "${myeconfargs[@]}" if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then