From nobody Fri Nov 26 18:49:21 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EF43418ADCC1; Fri, 26 Nov 2021 18:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J13gk19RQz4RhX; Fri, 26 Nov 2021 18:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D42375D3C; Fri, 26 Nov 2021 18:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AQInLw0049920; Fri, 26 Nov 2021 18:49:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AQInLPE049919; Fri, 26 Nov 2021 18:49:21 GMT (envelope-from git) Date: Fri, 26 Nov 2021 18:49:21 GMT Message-Id: <202111261849.1AQInLPE049919@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 4af982e6bea0 - main - lang/python3(6|7|8|9|10|11): work around unwanted multiarch detection again List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4af982e6bea019a33ae85c6c92a3042fadccb739 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637952562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MtlwvmHT0dhOUKFqvHgZe7M8nX0vMj+zeBM9mxEv0I=; b=X6Ld+AZppIddB17shG38Oto1zKZ1LTNey82N3z08zz4alQaDfvhVLgXRLadNLmOGdG9HOM fyIyw80sl/ddabhO40UUxNPsckS7U2w9Al7pJqnCV9/jbitflmF9jwo7gG3KI2dlovkMSx dYVJt4XskYo6aLtcr34UdUXhcvKdi2oXTT1nd4OXDAnCPyInGJOm7ZanGMCIjWidCD3ltL nJf3UJ0lfeb2Lxbsxlu3DitLBzsQiakRGskPe09lBlzYU4FFRy5TD/PPjWC7WpQnvheemg Ps4pPvtEqSZNekhYoXRRr4smg171B1uQYqVufcGbqQwO81EqQQR0yKiyYE3kOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637952562; a=rsa-sha256; cv=none; b=T1NoPUvzV+E+ABTJ7Sw/nXNdo6xodHkhzjXLrg9OQIeH0+B1g0xCf1+9olS9QdKL3rCtOZ xp4AuHlRJikwUT3ViJ6Mk5JaSvu57bN3xMpY7wM9XrgJv/IJgkJzahT4mpuF1Gxl6MShgn 4Hpsqx7nQRk1MGexKSReCGjrgrTLREmzEzYv2qUyJAqcer5eC+5QyJ7dQYmqrEjOfvEnWL 9pzTMshngSL9Qvql3Of4EeMnrbhy/kDaKM4lTjJdSSQ30d4ml67MmopGjJEZcWlIglLfRg iC4SILAdDJpA0u42pLKKa09sMg5TBOJZV7HEGqXZwsLqnu+jFoHlS2YYgGGo9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=4af982e6bea019a33ae85c6c92a3042fadccb739 commit 4af982e6bea019a33ae85c6c92a3042fadccb739 Author: Dimitry Andric AuthorDate: 2021-11-26 16:02:16 +0000 Commit: Dimitry Andric CommitDate: 2021-11-26 18:48:57 +0000 lang/python3(6|7|8|9|10|11): work around unwanted multiarch detection again In ports 6bef09666460 we patched out python's erroneous multiarch detection using sed, but upstream changed the surrounding parts in the configure script to defeat the regex we were using. Update the regex to cope with the change. PR: 259896, 258377 MFH: 2021Q4 Approved by: maintainer timeout (9 days) --- lang/python310/Makefile | 3 +-- lang/python311/Makefile | 3 +-- lang/python36/Makefile | 3 +-- lang/python37/Makefile | 3 +-- lang/python38/Makefile | 3 +-- lang/python39/Makefile | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/lang/python310/Makefile b/lang/python310/Makefile index c74cb102450a..1faaded5c8b7 100644 --- a/lang/python310/Makefile +++ b/lang/python310/Makefile @@ -127,8 +127,7 @@ post-patch: @${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py # disable detection of multiarch as it breaks with clang >= 13, which adds a # major.minor version number in -print-multiarch output, confusing Python - @${REINPLACE_CMD} -e 's|^MULTIARCH=.*|MULTIARCH=|' ${WRKSRC}/configure \ - ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure # Apply DISABLED_EXTENSIONS @${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local . for _module in ${DISABLED_EXTENSIONS} diff --git a/lang/python311/Makefile b/lang/python311/Makefile index 81eca2b4c2dc..eee7fb8b94d2 100644 --- a/lang/python311/Makefile +++ b/lang/python311/Makefile @@ -126,8 +126,7 @@ post-patch: @${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py # disable detection of multiarch as it breaks with clang >= 13, which adds a # major.minor version number in -print-multiarch output, confusing Python - @${REINPLACE_CMD} -e 's|^MULTIARCH=.*|MULTIARCH=|' ${WRKSRC}/configure \ - ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure # Apply DISABLED_EXTENSIONS @${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local . for _module in ${DISABLED_EXTENSIONS} diff --git a/lang/python36/Makefile b/lang/python36/Makefile index ff039c4118b8..9a30d37773c3 100644 --- a/lang/python36/Makefile +++ b/lang/python36/Makefile @@ -128,8 +128,7 @@ PLIST_SUB+= NO_NIS="" post-patch: # disable detection of multiarch as it breaks with clang >= 13, which adds a # major.minor version number in -print-multiarch output, confusing Python - @${REINPLACE_CMD} -e 's|^MULTIARCH=.*|MULTIARCH=|' ${WRKSRC}/configure \ - ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure post-install: .if ! ${PORT_OPTIONS:MDEBUG} diff --git a/lang/python37/Makefile b/lang/python37/Makefile index 3634f533be11..43de00c66dd0 100644 --- a/lang/python37/Makefile +++ b/lang/python37/Makefile @@ -114,8 +114,7 @@ post-patch: @${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py # disable detection of multiarch as it breaks with clang >= 13, which adds a # major.minor version number in -print-multiarch output, confusing Python - @${REINPLACE_CMD} -e 's|^MULTIARCH=.*|MULTIARCH=|' ${WRKSRC}/configure \ - ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure # Apply DISABLED_EXTENSIONS @${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local . for _module in ${DISABLED_EXTENSIONS} diff --git a/lang/python38/Makefile b/lang/python38/Makefile index 6597443318e7..14fa1346d41c 100644 --- a/lang/python38/Makefile +++ b/lang/python38/Makefile @@ -118,8 +118,7 @@ post-patch: @${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py # disable detection of multiarch as it breaks with clang >= 13, which adds a # major.minor version number in -print-multiarch output, confusing Python - @${REINPLACE_CMD} -e 's|^MULTIARCH=.*|MULTIARCH=|' ${WRKSRC}/configure \ - ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure # Apply DISABLED_EXTENSIONS @${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local . for _module in ${DISABLED_EXTENSIONS} diff --git a/lang/python39/Makefile b/lang/python39/Makefile index bbc60fa202f5..25a7509e4959 100644 --- a/lang/python39/Makefile +++ b/lang/python39/Makefile @@ -118,8 +118,7 @@ post-patch: @${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py # disable detection of multiarch as it breaks with clang >= 13, which adds a # major.minor version number in -print-multiarch output, confusing Python - @${REINPLACE_CMD} -e 's|^MULTIARCH=.*|MULTIARCH=|' ${WRKSRC}/configure \ - ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure # Apply DISABLED_EXTENSIONS @${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local . for _module in ${DISABLED_EXTENSIONS}