diff options
author | 2015-03-02 19:06:11 -0500 | |
---|---|---|
committer | 2015-03-02 19:06:11 -0500 | |
commit | 222e9260bda1c2c1b3a2ce3cabd29faab6b73f6c (patch) | |
tree | 8408d4bc8cc3023d4f564840d9e8eb2058c6954c | |
parent | Updates for 3.4.2 by Arfrever. (diff) | |
download | python-gentoo-patches-222e9260bda1c2c1b3a2ce3cabd29faab6b73f6c.tar.gz python-gentoo-patches-222e9260bda1c2c1b3a2ce3cabd29faab6b73f6c.tar.bz2 python-gentoo-patches-222e9260bda1c2c1b3a2ce3cabd29faab6b73f6c.zip |
-rw-r--r-- | patches/01_all_static_library_location.patch | 12 | ||||
-rw-r--r-- | patches/05_all_regenerate_platform-specific_modules.patch | 10 | ||||
-rw-r--r-- | patches/21_all_distutils_c++.patch | 2 | ||||
-rw-r--r-- | patches/22_all_tests_environment.patch | 19 |
4 files changed, 29 insertions, 14 deletions
diff --git a/patches/01_all_static_library_location.patch b/patches/01_all_static_library_location.patch index 8f92994..67d1873 100644 --- a/patches/01_all_static_library_location.patch +++ b/patches/01_all_static_library_location.patch @@ -4,7 +4,7 @@ https://bugs.python.org/issue6103 --- Makefile.pre.in +++ Makefile.pre.in -@@ -1004,6 +1004,19 @@ +@@ -1005,6 +1005,19 @@ $(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \ $$ensurepip --root=$(DESTDIR)/ ; \ fi @@ -24,7 +24,7 @@ https://bugs.python.org/issue6103 commoninstall: @FRAMEWORKALTINSTALLFIRST@ \ altbininstall libinstall inclinstall libainstall \ -@@ -1324,18 +1337,6 @@ +@@ -1325,18 +1338,6 @@ else true; \ fi; \ done @@ -45,10 +45,10 @@ https://bugs.python.org/issue6103 $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in --- Misc/python-config.in +++ Misc/python-config.in -@@ -49,11 +49,7 @@ - elif opt in ('--libs', '--ldflags'): - libs = getvar('LIBS').split() + getvar('SYSLIBS').split() - libs.append('-lpython' + pyver + sys.abiflags) +@@ -50,11 +50,7 @@ + libs = ['-lpython' + pyver + sys.abiflags] + libs += getvar('LIBS').split() + libs += getvar('SYSLIBS').split() - # add the prefix/lib/pythonX.Y/config dir, but only if there is no - # shared library in prefix/lib/. if opt == '--ldflags': diff --git a/patches/05_all_regenerate_platform-specific_modules.patch b/patches/05_all_regenerate_platform-specific_modules.patch index bfb5a82..6e985f3 100644 --- a/patches/05_all_regenerate_platform-specific_modules.patch +++ b/patches/05_all_regenerate_platform-specific_modules.patch @@ -37,7 +37,7 @@ https://bugs.python.org/issue12619 +python$EXE ../../Tools/scripts/h2py.py /usr/include/sys/stropts.h --- Makefile.pre.in +++ Makefile.pre.in -@@ -464,7 +464,7 @@ +@@ -465,7 +465,7 @@ # Default target all: build_all @@ -46,7 +46,7 @@ https://bugs.python.org/issue12619 # Compile a binary with gcc profile guided optimization. profile-opt: -@@ -572,6 +572,32 @@ +@@ -573,6 +573,32 @@ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build @@ -79,7 +79,7 @@ https://bugs.python.org/issue12619 # Build static library # avoid long command lines, same as LIBRARY_OBJS $(LIBRARY): $(LIBRARY_OBJS) -@@ -1189,7 +1215,7 @@ +@@ -1190,7 +1216,7 @@ unittest unittest/test unittest/test/testmock \ venv venv/scripts venv/scripts/posix \ curses pydoc_data $(MACHDEPS) @@ -88,7 +88,7 @@ https://bugs.python.org/issue12619 @for i in $(SCRIPTDIR) $(LIBDEST); \ do \ if test ! -d $(DESTDIR)$$i; then \ -@@ -1272,23 +1298,6 @@ +@@ -1273,23 +1299,6 @@ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt @@ -112,7 +112,7 @@ https://bugs.python.org/issue12619 python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh # Substitution happens here, as the completely-expanded BINDIR # is not available in configure -@@ -1611,7 +1620,7 @@ +@@ -1615,7 +1624,7 @@ Python/thread.o: @THREADHEADERS@ # Declare targets that aren't real files diff --git a/patches/21_all_distutils_c++.patch b/patches/21_all_distutils_c++.patch index 6e8ef61..cf81742 100644 --- a/patches/21_all_distutils_c++.patch +++ b/patches/21_all_distutils_c++.patch @@ -229,7 +229,7 @@ https://bugs.python.org/issue1222585 _INITPRE = '_OSX_SUPPORT_INITIAL_' --- Makefile.pre.in +++ Makefile.pre.in -@@ -568,7 +568,7 @@ +@@ -569,7 +569,7 @@ *\ -s*|s*) quiet="-q";; \ *) quiet="";; \ esac; \ diff --git a/patches/22_all_tests_environment.patch b/patches/22_all_tests_environment.patch index 3ccb281..6eb75f8 100644 --- a/patches/22_all_tests_environment.patch +++ b/patches/22_all_tests_environment.patch @@ -2,7 +2,7 @@ https://bugs.python.org/issue1674555 --- Lib/site.py +++ Lib/site.py -@@ -545,8 +545,9 @@ +@@ -545,8 +545,12 @@ known_paths = venv(known_paths) if ENABLE_USER_SITE is None: ENABLE_USER_SITE = check_enableusersite() @@ -11,6 +11,9 @@ https://bugs.python.org/issue1674555 + if os.environ.get("_PYTHONNOSITEPACKAGES") is None: + known_paths = addusersitepackages(known_paths) + known_paths = addsitepackages(known_paths) ++ else: ++ # Initialize USER_BASE and USER_SITE. ++ getusersitepackages() setquit() setcopyright() sethelper() @@ -163,9 +166,21 @@ https://bugs.python.org/issue1674555 if site.ENABLE_USER_SITE and not os.path.isdir(site.USER_SITE): # need to add user site directory for tests os.makedirs(site.USER_SITE) +@@ -436,8 +441,11 @@ + def test_startup_imports(self): + # This tests checks which modules are loaded by Python when it + # initially starts upon startup. ++ env = os.environ.copy() ++ env["_PYTHONNOSITEPACKAGES"] = "1" + popen = subprocess.Popen([sys.executable, '-I', '-v', '-c', + 'import sys; print(set(sys.modules))'], ++ env=env, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = popen.communicate() --- Makefile.pre.in +++ Makefile.pre.in -@@ -959,7 +959,7 @@ +@@ -960,7 +960,7 @@ ###################################################################### TESTOPTS= $(EXTRATESTOPTS) |