diff options
author | Wen Heping <wen@FreeBSD.org> | 2016-12-25 15:08:35 +0000 |
---|---|---|
committer | Wen Heping <wen@FreeBSD.org> | 2016-12-25 15:08:35 +0000 |
commit | 234f3ad65829382f91f22039a580054a2ca579bc (patch) | |
tree | 51bf2ba3ea60c84edcddf78b9d40308f80f50a86 /lang/python36/files/patch-issue20210 | |
parent | 39235d9869068497977ef26c57316b818cd65b06 (diff) | |
download | ports-234f3ad65829382f91f22039a580054a2ca579bc.tar.gz ports-234f3ad65829382f91f22039a580054a2ca579bc.zip |
- Repocopy lang/python35 --> lang/python36 and update to 3.6.0
Notes
Notes:
svn path=/head/; revision=429438
Diffstat (limited to 'lang/python36/files/patch-issue20210')
-rw-r--r-- | lang/python36/files/patch-issue20210 | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/lang/python36/files/patch-issue20210 b/lang/python36/files/patch-issue20210 new file mode 100644 index 000000000000..38ad041e322c --- /dev/null +++ b/lang/python36/files/patch-issue20210 @@ -0,0 +1,68 @@ +# Backport patch 0001 from Issue #20210 +# Issue: http://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 |