From owner-dev-commits-ports-all@freebsd.org Mon Sep 27 17:57:14 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 00EB166D201; Mon, 27 Sep 2021 17:57:14 +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 4HJ9MF6c3Hz4TfM; Mon, 27 Sep 2021 17:57:13 +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 BE87015748; Mon, 27 Sep 2021 17:57:13 +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 18RHvD3W095830; Mon, 27 Sep 2021 17:57:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18RHvDjq095829; Mon, 27 Sep 2021 17:57:13 GMT (envelope-from git) Date: Mon, 27 Sep 2021 17:57:13 GMT Message-Id: <202109271757.18RHvDjq095829@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: 6bef09666460 - main - lang/python3([6-9]|10): disable detection of multiarch 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: 6bef09666460fb9f9052550854fa69f5d5e4a0e8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Sep 2021 17:57:14 -0000 The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=6bef09666460fb9f9052550854fa69f5d5e4a0e8 commit 6bef09666460fb9f9052550854fa69f5d5e4a0e8 Author: Dimitry Andric AuthorDate: 2021-09-27 17:39:05 +0000 Commit: Dimitry Andric CommitDate: 2021-09-27 17:56:59 +0000 lang/python3([6-9]|10): disable detection of multiarch It breaks with clang >= 13, which adds a major.minor version number in -print-multiarch output, and the dot confuses Python: ModuleNotFoundError: No module named '_sysconfigdata__freebsd14_x86_64-unknown-freebsd14' Since we do not support multiarch, and the configure script has no way to disable the multiarch check, stub it out during post-patch. PR: 258377 Approved by: maintainer timeout (2 weeks) MFH: 2021Q3 --- lang/python310/Makefile | 4 ++++ lang/python36/Makefile | 6 ++++++ lang/python37/Makefile | 4 ++++ lang/python38/Makefile | 4 ++++ lang/python39/Makefile | 4 ++++ 5 files changed, 22 insertions(+) diff --git a/lang/python310/Makefile b/lang/python310/Makefile index 3dbf8d5d004e..64aba656d340 100644 --- a/lang/python310/Makefile +++ b/lang/python310/Makefile @@ -124,6 +124,10 @@ post-patch: # which introduces hidden dependency and breaks build @${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure @${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 # 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 93aa71936d4d..5b67fbd5044a 100644 --- a/lang/python36/Makefile +++ b/lang/python36/Makefile @@ -124,6 +124,12 @@ DISABLED_EXTENSIONS+= nis PLIST_SUB+= NO_NIS="" .endif +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 + post-install: .if ! ${PORT_OPTIONS:MDEBUG} ${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: https://bugs.python.org/issue17975 diff --git a/lang/python37/Makefile b/lang/python37/Makefile index 8909af0dd7ab..4db00e66e9d2 100644 --- a/lang/python37/Makefile +++ b/lang/python37/Makefile @@ -111,6 +111,10 @@ post-patch: # which introduces hidden dependency and breaks build @${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure @${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 # 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 68359a8579a8..f3dcec0757fa 100644 --- a/lang/python38/Makefile +++ b/lang/python38/Makefile @@ -115,6 +115,10 @@ post-patch: # which introduces hidden dependency and breaks build @${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure @${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 # 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 4a0d31ba17f2..2d052cf3741d 100644 --- a/lang/python39/Makefile +++ b/lang/python39/Makefile @@ -116,6 +116,10 @@ post-patch: # which introduces hidden dependency and breaks build @${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure @${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 # Apply DISABLED_EXTENSIONS @${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local . for _module in ${DISABLED_EXTENSIONS}