Attachment 227773 Details for Bug 258377 – Stub out multiarch detection in lang/python3X ports for clang 13

[patch] Stub out multiarch detection in lang/python3X ports for clang 13

lang__python3X-fix-clang13-multiarch-1.diff (text/plain), 4.26 KB, created by Dimitry Andric on 2021-09-08 22:14:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2021-09-08 22:14:46 UTC

Size: 4.26 KB

patch

obsolete

>commit f7c6323844a874743c0d8a0400a41fbc7af197db
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   Wed Sep 8 23:59:36 2021 +0200
>
>    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.
>
>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 636f8d198350..b52d72bc3e06 100644
>--- a/lang/python36/Makefile
>+++ b/lang/python36/Makefile
>@@ -121,6 +121,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}

Actions: View | Diff

Attachments on bug 258377: 227773