016-adjust-config-paths.patch (2642B)
1 diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py 2 index 8bf1a70..c2708c3 100644 3 --- a/Lib/distutils/sysconfig.py 4 +++ b/Lib/distutils/sysconfig.py 5 @@ -424,6 +424,7 @@ def _init_posix(): 6 platform=sys.platform, 7 multiarch=getattr(sys.implementation, '_multiarch', ''), 8 )) 9 + name = '_sysconfigdata' 10 _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) 11 build_time_vars = _temp.build_time_vars 12 global _config_vars 13 diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py 14 index 9314e71..4861261 100644 15 --- a/Lib/sysconfig.py 16 +++ b/Lib/sysconfig.py 17 @@ -343,6 +343,7 @@ def get_makefile_filename(): 18 19 20 def _get_sysconfigdata_name(): 21 + return '_sysconfigdata' 22 return os.environ.get('_PYTHON_SYSCONFIGDATA_NAME', 23 '_sysconfigdata_{abi}_{platform}_{multiarch}'.format( 24 abi=sys.abiflags, 25 diff --git a/Makefile.pre.in b/Makefile.pre.in 26 index cd7d33d..ad6572f 100644 27 --- a/Makefile.pre.in 28 +++ b/Makefile.pre.in 29 @@ -1301,7 +1301,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c 30 esac; \ 31 done; \ 32 done 33 - $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \ 34 + $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata*.py \ 35 $(DESTDIR)$(LIBDEST); \ 36 $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt 37 if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \ 38 @@ -1436,7 +1436,7 @@ sharedinstall: sharedmods 39 --install-scripts=$(BINDIR) \ 40 --install-platlib=$(DESTSHARED) \ 41 --root=$(DESTDIR)/ 42 - -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py 43 + -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata*.py 44 -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__ 45 46 # Here are a couple of targets for MacOSX again, to install a full 47 diff --git a/configure b/configure 48 index cf95b27..8203fbb 100755 49 --- a/configure 50 +++ b/configure 51 @@ -14895,7 +14895,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)' 52 $as_echo "$LDVERSION" >&6; } 53 54 55 -if test x$PLATFORM_TRIPLET = x; then 56 +if true ; then 57 LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" 58 else 59 LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" 60 diff --git a/configure.ac b/configure.ac 61 index 1d63813..25f25ed 100644 62 --- a/configure.ac 63 +++ b/configure.ac 64 @@ -4600,7 +4600,7 @@ AC_MSG_RESULT($LDVERSION) 65 66 dnl define LIBPL after ABIFLAGS and LDVERSION is defined. 67 AC_SUBST(PY_ENABLE_SHARED) 68 -if test x$PLATFORM_TRIPLET = x; then 69 +if true ; then 70 LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" 71 else 72 LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"