Attachment 225650 Details for Bug 243937 – [patch] fix broken disable modules - py37+38+39 (v4)

[patch] [patch] fix broken disable modules - py37+38+39 (v4)

pr-python37+38+39-fix-broken-disable-modules.diff.v4 (text/plain), 5.72 KB, created by John Hein on 2021-06-08 19:16:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2021-06-08 19:16:32 UTC

Size: 5.72 KB

patch

obsolete

>diff --git a/lang/python37/Makefile b/lang/python37/Makefile
>index d95dc23b192a..1a2bf9cbad35 100644
>--- a/lang/python37/Makefile
>+++ b/lang/python37/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 --with-system-ffi --with-system-libmpdec --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
> 
>@@ -108,6 +108,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/python37/files/patch-issue20210 b/lang/python37/files/patch-issue20210
>deleted file mode 100644
>index 90330d8f90a5..000000000000
>--- a/lang/python37/files/patch-issue20210
>+++ /dev/null
>@@ -1,68 +0,0 @@
>-# Backport patch 0001 from Issue #20210
>-# Issue: https://bugs.python.org/issue20210
>-# By: Thomas Petazzoni
>-
>---- ./Makefile.pre.in.orig	2014-03-24 22:45:17.908886504 +1100
>-+++ ./Makefile.pre.in	2014-03-24 22:47:55.503779805 +1100
>-@@ -172,6 +172,8 @@
>- # configure script arguments
>- CONFIG_ARGS=	@CONFIG_ARGS@
>- 
>-+# disabled extensions
>-+DISABLED_EXTENSIONS=	@DISABLED_EXTENSIONS@
>- 
>- # Subdirectories with code
>- SRCDIRS= 	@SRCDIRS@
>-@@ -555,6 +557,7 @@
>- 	esac; \
>- 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
>- 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
>-+		DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
>- 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
>- 
>- # Build static library
>-@@ -1352,7 +1355,8 @@
>- # Install the dynamically loadable modules
>- # This goes into $(exec_prefix)
>- sharedinstall: sharedmods
>--	$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
>-+	$(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
>-+		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
>- 	   	--prefix=$(prefix) \
>- 		--install-scripts=$(BINDIR) \
>- 		--install-platlib=$(DESTSHARED) \
>---- ./configure.ac.orig	2014-03-24 22:48:10.442551831 +1100
>-+++ ./configure.ac	2014-03-24 22:48:42.059827384 +1100
>-@@ -2331,6 +2331,8 @@
>- 
>- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
>- 
>-+AC_SUBST(DISABLED_EXTENSIONS)
>-+
>- # Check for use of the system expat library
>- AC_MSG_CHECKING(for --with-system-expat)
>- AC_ARG_WITH(system_expat,
>---- configure.orig	2015-03-01 13:57:08.000000000 +0300
>-+++ configure	2015-03-01 13:57:30.000000000 +0300
>-@@ -650,6 +650,7 @@
>- TCLTK_LIBS
>- TCLTK_INCLUDES
>- LIBFFI_INCLUDEDIR
>-+DISABLED_EXTENSIONS
>- PKG_CONFIG_LIBDIR
>- PKG_CONFIG_PATH
>- PKG_CONFIG
>---- ./setup.py.orig	2014-03-24 22:48:48.495472513 +1100
>-+++ ./setup.py	2014-03-24 22:49:20.076122201 +1100
>-@@ -33,7 +33,10 @@
>- COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
>- 
>- # This global variable is used to hold the list of modules to be disabled.
>--disabled_module_list = []
>-+try:
>-+    disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ")
>-+except KeyError:
>-+    disabled_module_list = list()
>- 
>- def add_dir_to_list(dirlist, dir):
>-     """Add the directory 'dir' to the list 'dirlist' (after any relative
>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

Flags:

jcfyecrayz: maintainer-approval? (python)

Actions: View | Diff

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