Attachment #225650 for bug #243937

View | Details | Raw Unified | Return to bug 243937 | Differences between
Collapse All | Expand All




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="" # 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


.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




# 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




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="" # 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


.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




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="" # 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


.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

Return to bug 243937

Lines 29-37 PYTHON_VER= ${PYTHON_DISTVERSION:R} Link Here

(-)b/lang/python37/Makefile (-2 / +3 lines)
29	PYTHON_VERSION= python${PYTHON_VER}	29	PYTHON_VERSION= python${PYTHON_VER}
30	PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}	30	PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}
31		31
32	DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm
33	CONFIGURE_ARGS+= --enable-shared --with-system-ffi --with-system-libmpdec --without-ensurepip	32	CONFIGURE_ARGS+= --enable-shared --with-system-ffi --with-system-libmpdec --without-ensurepip
34	CONFIGURE_ENV+= OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}" # Null out OPT to respect user CFLAGS and remove optimizations	33	CONFIGURE_ENV+= OPT="" # Null out OPT to respect user CFLAGS and remove optimizations
		34	DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm
35		35
36	INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files	36	INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files
37		37
Lines 108-113 PLIST_SUB+= NO_NIS="" Link Here
108	.endif	108	.endif
109		109
110	post-patch:	110	post-patch:
		111	${PRINTF} 'disabled\n${DISABLED_EXTENSIONS}\n' > ${WRKSRC}/Modules/Setup.local
111	# disable the detection of includes and library from e2fsprogs-libuuid,	112	# disable the detection of includes and library from e2fsprogs-libuuid,
112	# which introduces hidden dependency and breaks build	113	# which introduces hidden dependency and breaks build
113	@${REINPLACE_CMD} -e 's\|uuid/uuid.h\|ignore_&\|' ${WRKSRC}/configure	114	@${REINPLACE_CMD} -e 's\|uuid/uuid.h\|ignore_&\|' ${WRKSRC}/configure

Removed Link Here

(-)a/lang/python37/files/patch-issue20210 (-68 lines)
1	# Backport patch 0001 from Issue #20210
2	# Issue: https://bugs.python.org/issue20210
3	# By: Thomas Petazzoni
4
5	--- ./Makefile.pre.in.orig 2014-03-24 22:45:17.908886504 +1100
6	+++ ./Makefile.pre.in 2014-03-24 22:47:55.503779805 +1100
7	@@ -172,6 +172,8 @@
8	# configure script arguments
9	CONFIG_ARGS= @CONFIG_ARGS@
10
11	+# disabled extensions
12	+DISABLED_EXTENSIONS= @DISABLED_EXTENSIONS@
13
14	# Subdirectories with code
15	SRCDIRS= @SRCDIRS@
16	@@ -555,6 +557,7 @@
17	esac; \
18	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
19	_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
20	+ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
21	$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
22
23	# Build static library
24	@@ -1352,7 +1355,8 @@
25	# Install the dynamically loadable modules
26	# This goes into $(exec_prefix)
27	sharedinstall: sharedmods
28	- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
29	+ $(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
30	+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
31	--prefix=$(prefix) \
32	--install-scripts=$(BINDIR) \
33	--install-platlib=$(DESTSHARED) \
34	--- ./configure.ac.orig 2014-03-24 22:48:10.442551831 +1100
35	+++ ./configure.ac 2014-03-24 22:48:42.059827384 +1100
36	@@ -2331,6 +2331,8 @@
37
38	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
39
40	+AC_SUBST(DISABLED_EXTENSIONS)
41	+
42	# Check for use of the system expat library
43	AC_MSG_CHECKING(for --with-system-expat)
44	AC_ARG_WITH(system_expat,
45	--- configure.orig 2015-03-01 13:57:08.000000000 +0300
46	+++ configure 2015-03-01 13:57:30.000000000 +0300
47	@@ -650,6 +650,7 @@
48	TCLTK_LIBS
49	TCLTK_INCLUDES
50	LIBFFI_INCLUDEDIR
51	+DISABLED_EXTENSIONS
52	PKG_CONFIG_LIBDIR
53	PKG_CONFIG_PATH
54	PKG_CONFIG
55	--- ./setup.py.orig 2014-03-24 22:48:48.495472513 +1100
56	+++ ./setup.py 2014-03-24 22:49:20.076122201 +1100
57	@@ -33,7 +33,10 @@
58	COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
59
60	# This global variable is used to hold the list of modules to be disabled.
61	-disabled_module_list = []
62	+try:
63	+ disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ")
64	+except KeyError:
65	+ disabled_module_list = list()
66
67	def add_dir_to_list(dirlist, dir):
68	"""Add the directory 'dir' to the list 'dirlist' (after any relative

Lines 28-36 PYTHON_VER= ${PYTHON_DISTVERSION:R} Link Here

(-)b/lang/python38/Makefile (-2 / +3 lines)
28	PYTHON_VERSION= python${PYTHON_VER}	28	PYTHON_VERSION= python${PYTHON_VER}
29	PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}	29	PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}
30		30
31	DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm
32	CONFIGURE_ARGS+= --enable-shared --without-ensurepip	31	CONFIGURE_ARGS+= --enable-shared --without-ensurepip
33	CONFIGURE_ENV+= OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}" # Null out OPT to respect user CFLAGS and remove optimizations	32	CONFIGURE_ENV+= OPT="" # Null out OPT to respect user CFLAGS and remove optimizations
		33	DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm
34		34
35	INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files	35	INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files
36		36
Lines 118-123 PLIST_SUB+= NO_NIS="" Link Here
118	.endif	118	.endif
119		119
120	post-patch:	120	post-patch:
		121	${PRINTF} 'disabled\n${DISABLED_EXTENSIONS}\n' > ${WRKSRC}/Modules/Setup.local
121	# disable the detection of includes and library from e2fsprogs-libuuid,	122	# disable the detection of includes and library from e2fsprogs-libuuid,
122	# which introduces hidden dependency and breaks build	123	# which introduces hidden dependency and breaks build
123	@${REINPLACE_CMD} -e 's\|uuid/uuid.h\|ignore_&\|' ${WRKSRC}/configure	124	@${REINPLACE_CMD} -e 's\|uuid/uuid.h\|ignore_&\|' ${WRKSRC}/configure

Lines 29-37 PYTHON_VER= ${PYTHON_DISTVERSION:R} Link Here

(-)b/lang/python39/Makefile (-2 / +3 lines)
29	PYTHON_VERSION= python${PYTHON_VER}	29	PYTHON_VERSION= python${PYTHON_VER}
30	PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}	30	PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}
31		31
32	DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm
33	CONFIGURE_ARGS+= --enable-shared --without-ensurepip	32	CONFIGURE_ARGS+= --enable-shared --without-ensurepip
34	CONFIGURE_ENV+= OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}" # Null out OPT to respect user CFLAGS and remove optimizations	33	CONFIGURE_ENV+= OPT="" # Null out OPT to respect user CFLAGS and remove optimizations
		34	DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm
35		35
36	INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files	36	INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files
37		37
Lines 119-124 PLIST_SUB+= NO_NIS="" Link Here
119	.endif	119	.endif
120		120
121	post-patch:	121	post-patch:
		122	${PRINTF} 'disabled\n${DISABLED_EXTENSIONS}\n' > ${WRKSRC}/Modules/Setup.local
122	# disable the detection of includes and library from e2fsprogs-libuuid,	123	# disable the detection of includes and library from e2fsprogs-libuuid,
123	# which introduces hidden dependency and breaks build	124	# which introduces hidden dependency and breaks build
124	@${REINPLACE_CMD} -e 's\|uuid/uuid.h\|ignore_&\|' ${WRKSRC}/configure	125	@${REINPLACE_CMD} -e 's\|uuid/uuid.h\|ignore_&\|' ${WRKSRC}/configure