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 05E1A158090 for ; Thu, 12 May 2022 17:10:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10EE8E08E0; Thu, 12 May 2022 17:10:38 +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 E459AE08E0 for ; Thu, 12 May 2022 17:10:37 +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 D1A6A3414DB for ; Thu, 12 May 2022 17:10:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3794142F for ; Thu, 12 May 2022 17:10:35 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1652375429.5952afb72168c02fa2486f222cc44167083c43ec.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-lang/python/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: dev-lang/python/python-3.9.12.ebuild X-VCS-Directories: dev-lang/python/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 5952afb72168c02fa2486f222cc44167083c43ec X-VCS-Branch: master Date: Thu, 12 May 2022 17:10:35 +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: b32780f6-db1f-4d70-bd57-3941a0db15cf X-Archives-Hash: 6778fc65ce581f087afda6ea46128661 commit: 5952afb72168c02fa2486f222cc44167083c43ec Author: Fabian Groffen gentoo org> AuthorDate: Thu May 12 17:10:29 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu May 12 17:10:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5952afb7 dev-lang/python-3.9.12: fix installation on Darwin Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Fabian Groffen gentoo.org> dev-lang/python/python-3.9.12.ebuild | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dev-lang/python/python-3.9.12.ebuild b/dev-lang/python/python-3.9.12.ebuild index 6ac508e466..6e5c470e8e 100644 --- a/dev-lang/python/python-3.9.12.ebuild +++ b/dev-lang/python/python-3.9.12.ebuild @@ -201,17 +201,6 @@ src_configure() { dbmliborder+="${dbmliborder:+:}gdbm" fi - if use aqua ; then - ECONF_SOURCE="${S}" OPT="" \ - econf \ - --enable-framework="${EPREFIX}" \ - --config-cache - fi - - # flock on 32-bits sparc Solaris is broken - [[ ${CHOST} == sparc-*-solaris* ]] && \ - export ac_cv_flock_decl=no - if use pgo; then local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") export PROFILE_TASK="-m test -j${jobs} --pgo-extended -x test_gdb -u-network" @@ -227,6 +216,10 @@ src_configure() { fi fi + # flock on 32-bits sparc Solaris is broken + [[ ${CHOST} == sparc-*-solaris* ]] && \ + export ac_cv_flock_decl=no + local myeconfargs=( # glibc-2.30 removes it; since we can't cleanly force-rebuild # Python on glibc upgrade, remove it proactively to give @@ -260,6 +253,13 @@ src_configure() { local -x LDFLAGS_NODIST=${LDFLAGS} local -x CFLAGS= LDFLAGS= + if use aqua ; then + ECONF_SOURCE="${S}" OPT="" \ + econf \ + --enable-framework="${EPREFIX}" \ + --config-cache + fi + econf "${myeconfargs[@]}" if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then @@ -379,8 +379,8 @@ src_install() { # Remove static library rm "${ED}"/usr/$(get_libdir)/libpython*.a || die - # Fix collisions between different slots of Python. - rm "${ED}/usr/$(get_libdir)/libpython3$(get_libname)" || die + # Fix collisions between different slots of Python. (if it exists, Darwin) + rm -f "${ED}/usr/$(get_libdir)/libpython3$(get_libname)" || die # Cheap hack to get version with ABIFLAGS local abiver=$(cd "${ED}/usr/include"; echo python*)