diff options
| author | Alexandru Ardelean <ardeleanalex@gmail.com> | 2017-05-17 16:45:48 +0300 |
|---|---|---|
| committer | Alexandru Ardelean <ardeleanalex@gmail.com> | 2017-05-17 16:51:14 +0300 |
| commit | 68312f49c0b4456e665ed438a86a44738caa765a (patch) | |
| tree | 6280a9fb0de5782ca8ca4ca39b014062e1b8d387 /lang/python/python3/patches | |
| parent | 1bf7af4ca53db6f58655857f6eb49a9893c854d9 (diff) | |
python packages: move all things python under lang/python
I admit this may be be a bit aggressive, but the lang
folder is getting cluttered/filled up with Python, PHP, Perl,
Ruby, etc. packages.
Makes sense to try to group them into per-lang folders.
I took the Pythons.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Diffstat (limited to 'lang/python/python3/patches')
11 files changed, 265 insertions, 0 deletions
diff --git a/lang/python/python3/patches/001-enable-zlib.patch b/lang/python/python3/patches/001-enable-zlib.patch new file mode 100644 index 000000000..780831e86 --- /dev/null +++ b/lang/python/python3/patches/001-enable-zlib.patch @@ -0,0 +1,25 @@ +From 6eeab87bc852481e599325549c854b701bf2e39f Mon Sep 17 00:00:00 2001 +From: Alexandru Ardelean <aa@ocedo.com> +Date: Thu, 25 Sep 2014 18:18:29 +0300 +Subject: [PATCH] enable zlib + +--- + Modules/Setup.dist | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Modules/Setup.dist b/Modules/Setup.dist +index 01fb85f..01ac492 100644 +--- a/Modules/Setup.dist ++++ b/Modules/Setup.dist +@@ -358,7 +358,7 @@ _symtable symtablemodule.c + # Andrew Kuchling's zlib module. + # This require zlib 1.1.3 (or later). + # See http://www.gzip.org/zlib/ +-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz ++zlib zlibmodule.c -lz + + # Interface to the Expat XML parser + # +-- +1.8.4.5 + diff --git a/lang/python/python3/patches/003-do-not-run-distutils-tests.patch b/lang/python/python3/patches/003-do-not-run-distutils-tests.patch new file mode 100644 index 000000000..77c089f5f --- /dev/null +++ b/lang/python/python3/patches/003-do-not-run-distutils-tests.patch @@ -0,0 +1,46 @@ +diff --git a/Makefile.pre.in b/Makefile.pre.in +index ce2c0aa..b0c8322 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1256,41 +1256,6 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c + done; \ + done + $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt +- if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \ +- $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ +- $(DESTDIR)$(LIBDEST)/distutils/tests ; \ +- fi +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ +- -d $(LIBDEST) -f \ +- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ +- $(DESTDIR)$(LIBDEST) +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ +- -d $(LIBDEST) -f \ +- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ +- $(DESTDIR)$(LIBDEST) +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ +- -d $(LIBDEST) -f \ +- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ +- $(DESTDIR)$(LIBDEST) +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ +- -d $(LIBDEST)/site-packages -f \ +- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \ +- -d $(LIBDEST)/site-packages -f \ +- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ +- -d $(LIBDEST)/site-packages -f \ +- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt +- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt + + # Create the PLATDIR source directory, if one wasn't distributed.. + $(srcdir)/Lib/$(PLATDIR): diff --git a/lang/python/python3/patches/004-do-not-write-bytes-codes.patch b/lang/python/python3/patches/004-do-not-write-bytes-codes.patch new file mode 100644 index 000000000..1da7b8be8 --- /dev/null +++ b/lang/python/python3/patches/004-do-not-write-bytes-codes.patch @@ -0,0 +1,22 @@ +diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c +index a17adf7..415b3f6 100644 +--- a/Python/pylifecycle.c ++++ b/Python/pylifecycle.c +@@ -86,7 +86,7 @@ int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */ + int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */ + int Py_FrozenFlag; /* Needed by getpath.c */ + int Py_IgnoreEnvironmentFlag; /* e.g. PYTHONPATH, PYTHONHOME */ +-int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.py[co]) */ ++int Py_DontWriteBytecodeFlag = 1; /* Suppress writing bytecode files (*.py[co]) */ + int Py_NoUserSiteDirectory = 0; /* for -s and site.py */ + int Py_UnbufferedStdioFlag = 0; /* Unbuffered binary std{in,out,err} */ + int Py_HashRandomizationFlag = 0; /* for -R and PYTHONHASHSEED */ +@@ -309,7 +309,7 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib) + if ((p = Py_GETENV("PYTHONOPTIMIZE")) && *p != '\0') + Py_OptimizeFlag = add_flag(Py_OptimizeFlag, p); + if ((p = Py_GETENV("PYTHONDONTWRITEBYTECODE")) && *p != '\0') +- Py_DontWriteBytecodeFlag = add_flag(Py_DontWriteBytecodeFlag, p); ++ Py_DontWriteBytecodeFlag = atoi(p); + /* The variable is only tested for existence here; _PyRandom_Init will + check its value further. */ + if ((p = Py_GETENV("PYTHONHASHSEED")) && *p != '\0') diff --git a/lang/python/python3/patches/006-remove-debian-multiarch-support.patch b/lang/python/python3/patches/006-remove-debian-multiarch-support.patch new file mode 100644 index 000000000..52d52b94e --- /dev/null +++ b/lang/python/python3/patches/006-remove-debian-multiarch-support.patch @@ -0,0 +1,12 @@ +diff --git a/setup.py b/setup.py +index 7868b7b..9ae0ef2 100644 +--- a/setup.py ++++ b/setup.py +@@ -444,7 +444,6 @@ class PyBuildExt(build_ext): + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + if cross_compiling: + self.add_gcc_paths() +- self.add_multiarch_paths() + + # Add paths specified in the environment variables LDFLAGS and + # CPPFLAGS for header and library files. diff --git a/lang/python/python3/patches/007-distutils-do-not-adjust-path.patch b/lang/python/python3/patches/007-distutils-do-not-adjust-path.patch new file mode 100644 index 000000000..49fe92629 --- /dev/null +++ b/lang/python/python3/patches/007-distutils-do-not-adjust-path.patch @@ -0,0 +1,10 @@ +--- a/Lib/distutils/command/build_scripts.py ++++ b/Lib/distutils/command/build_scripts.py +@@ -89,6 +89,7 @@ class build_scripts (Command): + adjust = 1 + post_interp = match.group(1) or '' + ++ adjust = 0 + if adjust: + log.info("copying and adjusting %s -> %s", script, + self.build_dir) diff --git a/lang/python/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch b/lang/python/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch new file mode 100644 index 000000000..5a106d4e8 --- /dev/null +++ b/lang/python/python3/patches/010-do-not-add-rt-lib-dirs-when-cross-compiling.patch @@ -0,0 +1,15 @@ +diff --git a/setup.py b/setup.py +index 7868b7b..544fa7e 100644 +--- a/setup.py ++++ b/setup.py +@@ -452,8 +452,9 @@ class PyBuildExt(build_ext): + # directly since an inconsistently reproducible issue comes up where + # the environment variable is not set even though the value were passed + # into configure and stored in the Makefile (issue found on OS X 10.3). ++ rt_lib_dirs = [] if cross_compiling else self.compiler.runtime_library_dirs + for env_var, arg_name, dir_list in ( +- ('LDFLAGS', '-R', self.compiler.runtime_library_dirs), ++ ('LDFLAGS', '-R', rt_lib_dirs), + ('LDFLAGS', '-L', self.compiler.library_dirs), + ('CPPFLAGS', '-I', self.compiler.include_dirs)): + env_val = sysconfig.get_config_var(env_var) diff --git a/lang/python/python3/patches/011-fix-ncursesw-definition-colisions.patch b/lang/python/python3/patches/011-fix-ncursesw-definition-colisions.patch new file mode 100644 index 000000000..652932102 --- /dev/null +++ b/lang/python/python3/patches/011-fix-ncursesw-definition-colisions.patch @@ -0,0 +1,12 @@ +diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c +index 3bf2ca7..c156964 100644 +--- a/Modules/_cursesmodule.c ++++ b/Modules/_cursesmodule.c +@@ -116,7 +116,6 @@ char *PyCursesVersion = "2.2"; + #defines many common symbols (such as "lines") which breaks the + curses module in other ways. So the code will just specify + explicit prototypes here. */ +-extern int setupterm(char *,int,int *); + #ifdef __sgi + #include <term.h> + #endif diff --git a/lang/python/python3/patches/012-disable-wcsftime-detection.patch b/lang/python/python3/patches/012-disable-wcsftime-detection.patch new file mode 100644 index 000000000..55a383c28 --- /dev/null +++ b/lang/python/python3/patches/012-disable-wcsftime-detection.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 274af7e..85bbf0e 100755 +--- a/configure ++++ b/configure +@@ -10555,7 +10555,7 @@ for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ + sigtimedwait sigwait sigwaitinfo snprintf strftime strlcpy symlinkat sync \ + sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \ + truncate uname unlinkat unsetenv utimensat utimes waitid waitpid wait3 wait4 \ +- wcscoll wcsftime wcsxfrm wmemcmp writev _getpty ++ wcscoll wcsxfrm wmemcmp writev _getpty + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/lang/python/python3/patches/014-remove-platform-so-suffix.patch b/lang/python/python3/patches/014-remove-platform-so-suffix.patch new file mode 100644 index 000000000..cbc32d57a --- /dev/null +++ b/lang/python/python3/patches/014-remove-platform-so-suffix.patch @@ -0,0 +1,26 @@ +diff --git a/configure b/configure +index e823a08..84c525f 100755 +--- a/configure ++++ b/configure +@@ -14365,7 +14365,7 @@ $as_echo_n "checking ABIFLAGS... " >&6; } + $as_echo "$ABIFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5 + $as_echo_n "checking SOABI... " >&6; } +-SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET} ++SOABI='cpython-'`echo $VERSION | tr -d .` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5 + $as_echo "$SOABI" >&6; } + +diff --git a/configure.ac b/configure.ac +index 56a73df..1855af5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4314,7 +4314,7 @@ AC_SUBST(SOABI) + AC_MSG_CHECKING(ABIFLAGS) + AC_MSG_RESULT($ABIFLAGS) + AC_MSG_CHECKING(SOABI) +-SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET} ++SOABI='cpython-'`echo $VERSION | tr -d .` + AC_MSG_RESULT($SOABI) + + AC_SUBST(EXT_SUFFIX) diff --git a/lang/python/python3/patches/015-abort-on-failed-modules.patch b/lang/python/python3/patches/015-abort-on-failed-modules.patch new file mode 100644 index 000000000..eec488f3d --- /dev/null +++ b/lang/python/python3/patches/015-abort-on-failed-modules.patch @@ -0,0 +1,12 @@ +diff --git a/setup.py b/setup.py +index da67731..928e0de 100644 +--- a/setup.py ++++ b/setup.py +@@ -293,6 +293,7 @@ class PyBuildExt(build_ext): + print("Failed to build these modules:") + print_three_column(failed) + print() ++ if cross_compiling: sys.exit(1) + + if self.failed_on_import: + failed = self.failed_on_import[:] diff --git a/lang/python/python3/patches/016-adjust-config-paths.patch b/lang/python/python3/patches/016-adjust-config-paths.patch new file mode 100644 index 000000000..fb709b7e4 --- /dev/null +++ b/lang/python/python3/patches/016-adjust-config-paths.patch @@ -0,0 +1,72 @@ +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 8bf1a70..c2708c3 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -424,6 +424,7 @@ def _init_posix(): + platform=sys.platform, + multiarch=getattr(sys.implementation, '_multiarch', ''), + )) ++ name = '_sysconfigdata' + _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) + build_time_vars = _temp.build_time_vars + global _config_vars +diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py +index 9314e71..4861261 100644 +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -343,6 +343,7 @@ def get_makefile_filename(): + + + def _get_sysconfigdata_name(): ++ return '_sysconfigdata' + return os.environ.get('_PYTHON_SYSCONFIGDATA_NAME', + '_sysconfigdata_{abi}_{platform}_{multiarch}'.format( + abi=sys.abiflags, +diff --git a/Makefile.pre.in b/Makefile.pre.in +index cd7d33d..ad6572f 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1301,7 +1301,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c + esac; \ + done; \ + done +- $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \ ++ $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata*.py \ + $(DESTDIR)$(LIBDEST); \ + $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt + if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \ +@@ -1436,7 +1436,7 @@ sharedinstall: sharedmods + --install-scripts=$(BINDIR) \ + --install-platlib=$(DESTSHARED) \ + --root=$(DESTDIR)/ +- -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py ++ -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata*.py + -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__ + + # Here are a couple of targets for MacOSX again, to install a full +diff --git a/configure b/configure +index cf95b27..8203fbb 100755 +--- a/configure ++++ b/configure +@@ -14895,7 +14895,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)' + $as_echo "$LDVERSION" >&6; } + + +-if test x$PLATFORM_TRIPLET = x; then ++if true ; then + LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" + else + LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" +diff --git a/configure.ac b/configure.ac +index 1d63813..25f25ed 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4600,7 +4600,7 @@ AC_MSG_RESULT($LDVERSION) + + dnl define LIBPL after ABIFLAGS and LDVERSION is defined. + AC_SUBST(PY_ENABLE_SHARED) +-if test x$PLATFORM_TRIPLET = x; then ++if true ; then + LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" + else + LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" |
