From nobody Wed Sep 08 22:16:04 2021 X-Original-To: python@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 976E217AED92 for ; Wed, 8 Sep 2021 22:16:04 +0000 (UTC) (envelope-from bugzilla-noreply@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 4H4c0h3lbqz53rM for ; Wed, 8 Sep 2021 22:16:04 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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 612B55CE0 for ; Wed, 8 Sep 2021 22:16:04 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 188MG460024467 for ; Wed, 8 Sep 2021 22:16:04 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 188MG4mf024466 for python@FreeBSD.org; Wed, 8 Sep 2021 22:16:04 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: python@FreeBSD.org Subject: [Bug 258377] lang/python36 lang/python37 lang/python38 lang/python39 lang/python310: disable detection of multiarch for clang 13 Date: Wed, 08 Sep 2021 22:16:04 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: dim@FreeBSD.org X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: python@FreeBSD.org X-Bugzilla-Flags: maintainer-feedback? X-Bugzilla-Changed-Fields: attachments.ispatch Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: FreeBSD-specific Python issues List-Archive: https://lists.freebsd.org/archives/freebsd-python List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-python@freebsd.org X-BeenThere: freebsd-python@freebsd.org MIME-Version: 1.0 X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D258377 Dimitry Andric changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #227773|0 |1 is patch| | --- Comment #1 from Dimitry Andric --- Comment on attachment 227773 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D227773 Stub out multiarch detection in lang/python3X ports for clang 13 >commit f7c6323844a874743c0d8a0400a41fbc7af197db >Author: Dimitry Andric >Date: Wed Sep 8 23:59:36 2021 +0200 > > lang/python3([6-9]|10): disable detection of multiarch >=20=20=20=20 > It breaks with clang >=3D 13, which adds a major.minor version number = in > -print-multiarch output, and the dot confuses Python: >=20=20=20=20 > ModuleNotFoundError: No module named '_sysconfigdata__freebsd14_x86_64= -unknown-freebsd14' >=20=20=20=20 > Since we do not support multiarch, and the configure script has no way > to disable the multiarch check, stub it out during post-patch. > >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}/se= tup.py >+# disable detection of multiarch as it breaks with clang >=3D 13, which a= dds a >+# major.minor version number in -print-multiarch output, confusing Python >+ @${REINPLACE_CMD} -e 's|^MULTIARCH=3D.*|MULTIARCH=3D|' ${WRKSRC}/configu= re \ >+ ${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 636f8d198350..b52d72bc3e06 100644 >--- a/lang/python36/Makefile >+++ b/lang/python36/Makefile >@@ -121,6 +121,12 @@ DISABLED_EXTENSIONS+=3D nis > PLIST_SUB+=3D NO_NIS=3D"" > .endif >=20 >+post-patch: >+# disable detection of multiarch as it breaks with clang >=3D 13, which a= dds a >+# major.minor version number in -print-multiarch output, confusing Python >+ @${REINPLACE_CMD} -e 's|^MULTIARCH=3D.*|MULTIARCH=3D|' ${WRKSRC}/configu= re \ >+ ${WRKSRC}/configure.ac >+ > post-install: > .if ! ${PORT_OPTIONS:MDEBUG} > ${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: http= s://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}/se= tup.py >+# disable detection of multiarch as it breaks with clang >=3D 13, which a= dds a >+# major.minor version number in -print-multiarch output, confusing Python >+ @${REINPLACE_CMD} -e 's|^MULTIARCH=3D.*|MULTIARCH=3D|' ${WRKSRC}/configu= re \ >+ ${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}/se= tup.py >+# disable detection of multiarch as it breaks with clang >=3D 13, which a= dds a >+# major.minor version number in -print-multiarch output, confusing Python >+ @${REINPLACE_CMD} -e 's|^MULTIARCH=3D.*|MULTIARCH=3D|' ${WRKSRC}/configu= re \ >+ ${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}/se= tup.py >+# disable detection of multiarch as it breaks with clang >=3D 13, which a= dds a >+# major.minor version number in -print-multiarch output, confusing Python >+ @${REINPLACE_CMD} -e 's|^MULTIARCH=3D.*|MULTIARCH=3D|' ${WRKSRC}/configu= re \ >+ ${WRKSRC}/configure.ac > # Apply DISABLED_EXTENSIONS > @${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local > . for _module in ${DISABLED_EXTENSIONS} --=20 You are receiving this mail because: You are the assignee for the bug.=