Attachment 229557 Details for Bug 259896 – lang/python3(6|7|8|9|10): work around unwanted multiarch detection again

[patch] lang/python3(6|7|8|9|10): work around unwanted multiarch detection again

lang__python3X-fix-clang13-multiarch-2.diff (text/plain), 4.75 KB, created by Dimitry Andric on 2021-11-17 20:06:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2021-11-17 20:06:36 UTC

Size: 4.75 KB

patch

obsolete

>commit a6406bcf112dd1f679f65503c993c890c9892d3f
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   Wed Nov 17 21:04:30 2021 +0100
>
>    lang/python3(6|7|8|9|10): work around unwanted multiarch detection again
>
>diff --git a/lang/python310/Makefile b/lang/python310/Makefile
>index c74cb102450a..1dab7b1a1219 100644
>--- a/lang/python310/Makefile
>+++ b/lang/python310/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	python
> DISTVERSION=	${PYTHON_DISTVERSION}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	lang python
> MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//}
> PKGNAMESUFFIX=	${PYTHON_SUFFIX}
>@@ -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/python36/Makefile b/lang/python36/Makefile
>index ff039c4118b8..c44571d154ab 100644
>--- a/lang/python36/Makefile
>+++ b/lang/python36/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	python
> DISTVERSION=	${PYTHON_DISTVERSION}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	lang python
> MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
> PKGNAMESUFFIX=	${PYTHON_SUFFIX}
>@@ -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..aff88c7fd201 100644
>--- a/lang/python37/Makefile
>+++ b/lang/python37/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	python
> DISTVERSION=	${PYTHON_DISTVERSION}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	lang python
> MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
> PKGNAMESUFFIX=	${PYTHON_SUFFIX}
>@@ -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..6e13a8bcfa50 100644
>--- a/lang/python38/Makefile
>+++ b/lang/python38/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	python
> DISTVERSION=	${PYTHON_DISTVERSION}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	lang python
> MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
> PKGNAMESUFFIX=	${PYTHON_SUFFIX}
>@@ -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..082538a1516e 100644
>--- a/lang/python39/Makefile
>+++ b/lang/python39/Makefile
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	python
> DISTVERSION=	${PYTHON_DISTVERSION}
>+PORTREVISION=	1
> CATEGORIES=	lang python
> MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
> PKGNAMESUFFIX=	${PYTHON_SUFFIX}
>@@ -118,8 +119,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}

Actions: View | Diff

Attachments on bug 259896: 229557 | 229741