Page MenuHomeFreeBSD
Files F147760460

D31086.1784297303.diff
No OneTemporary
Actions

Size
5 KB
Referenced Files
None
Subscribers
None

D31086.1784297303.diff
View Options

diff --git a/lang/python37/Makefile b/lang/python37/Makefile
--- a/lang/python37/Makefile
+++ b/lang/python37/Makefile
@@ -30,7 +30,7 @@
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
INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files
@@ -111,6 +111,11 @@
# 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
+# Apply DISABLED_EXTENSIONS
+ @${ECHO} '*disabled*' > ${WRKSRC}/Modules/Setup.local
+. for _module in ${DISABLED_EXTENSIONS}
+ @${ECHO} ${_module} >> ${WRKSRC}/Modules/Setup.local
+. endfor
post-install:
.if ! ${PORT_OPTIONS:MDEBUG}
diff --git a/lang/python37/files/patch-issue20210 b/lang/python37/files/patch-issue20210
deleted file mode 100644
--- 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
--- a/lang/python38/Makefile
+++ b/lang/python38/Makefile
@@ -33,7 +33,7 @@
DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm
CONFIGURE_ARGS+= --enable-shared --without-ensurepip \
--with-system-ffi
-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
INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files
@@ -115,6 +115,11 @@
# 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
+# Apply DISABLED_EXTENSIONS
+ @${ECHO} '*disabled*' > ${WRKSRC}/Modules/Setup.local
+. for _module in ${DISABLED_EXTENSIONS}
+ @${ECHO} ${_module} >> ${WRKSRC}/Modules/Setup.local
+. endfor
post-install:
.if ! ${PORT_OPTIONS:MDEBUG}
diff --git a/lang/python39/Makefile b/lang/python39/Makefile
--- a/lang/python39/Makefile
+++ b/lang/python39/Makefile
@@ -34,7 +34,7 @@
DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm
CONFIGURE_ARGS+= --enable-shared --without-ensurepip \
--with-system-ffi
-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
INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files
@@ -116,6 +116,11 @@
# 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
+# Apply DISABLED_EXTENSIONS
+ @${ECHO} '*disabled*' > ${WRKSRC}/Modules/Setup.local
+. for _module in ${DISABLED_EXTENSIONS}
+ @${ECHO} ${_module} >> ${WRKSRC}/Modules/Setup.local
+. endfor
post-install:
.if ! ${PORT_OPTIONS:MDEBUG}

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 17, 2:08 PM (11 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29164215
Default Alt Text
D31086.1784297303.diff (5 KB)

Event Timeline