Attachment 225585 Details for Bug 243937 – [patch] fix broken disable modules - py38+39 (v3)

[patch] [patch] fix broken disable modules - py38+39 (v3)

pr-python38+39-fix-broken-disable-modules.diff.v3 (text/plain), 2.12 KB, created by John Hein on 2021-06-06 01:07:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2021-06-06 01:07:23 UTC

Size: 2.12 KB

patch

obsolete

>diff --git a/lang/python38/Makefile b/lang/python38/Makefile
>index be973fca11ac..88411f61d1d5 100644
>--- a/lang/python38/Makefile
>+++ b/lang/python38/Makefile
>@@ -28,9 +28,9 @@ PYTHON_VER=		${PYTHON_DISTVERSION:R}
> PYTHON_VERSION=		python${PYTHON_VER}
> PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
> 
>-DISABLED_EXTENSIONS=	_sqlite3 _tkinter _gdbm
> CONFIGURE_ARGS+=	--enable-shared --without-ensurepip
>-CONFIGURE_ENV+=		OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}"	# Null out OPT to respect user CFLAGS and remove optimizations
>+CONFIGURE_ENV+=		OPT="" # Null out OPT to respect user CFLAGS and remove optimizations
>+DISABLED_EXTENSIONS=	_sqlite3 _tkinter _gdbm
> 
> INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
> 
>@@ -118,6 +118,7 @@ PLIST_SUB+=	NO_NIS=""
> .endif
> 
> post-patch:
>+	${PRINTF} '*disabled*\n${DISABLED_EXTENSIONS}\n' > ${WRKSRC}/Modules/Setup.local
> # disable the detection of includes and library from e2fsprogs-libuuid,
> # which introduces hidden dependency and breaks build
> 	@${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure
>diff --git a/lang/python39/Makefile b/lang/python39/Makefile
>index 8a9b87d3c043..fe02f160f561 100644
>--- a/lang/python39/Makefile
>+++ b/lang/python39/Makefile
>@@ -29,9 +29,9 @@ PYTHON_VER=		${PYTHON_DISTVERSION:R}
> PYTHON_VERSION=		python${PYTHON_VER}
> PYTHON_SUFFIX=		${PYTHON_VER:S/.//g}
> 
>-DISABLED_EXTENSIONS=	_sqlite3 _tkinter _gdbm
> CONFIGURE_ARGS+=	--enable-shared --without-ensurepip
>-CONFIGURE_ENV+=		OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}"	# Null out OPT to respect user CFLAGS and remove optimizations
>+CONFIGURE_ENV+=		OPT="" # Null out OPT to respect user CFLAGS and remove optimizations
>+DISABLED_EXTENSIONS=	_sqlite3 _tkinter _gdbm
> 
> INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
> 
>@@ -119,6 +119,7 @@ PLIST_SUB+=	NO_NIS=""
> .endif
> 
> post-patch:
>+	${PRINTF} '*disabled*\n${DISABLED_EXTENSIONS}\n' > ${WRKSRC}/Modules/Setup.local
> # disable the detection of includes and library from e2fsprogs-libuuid,
> # which introduces hidden dependency and breaks build
> 	@${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure

Actions: View | Diff

Attachments on bug 243937: 211420 | 211421 | 211437 | 225585 | 225650