1
0

016-adjust-config-paths.patch 2.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172
  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. def _get_sysconfigdata_name():
  19. + return '_sysconfigdata'
  20. return os.environ.get('_PYTHON_SYSCONFIGDATA_NAME',
  21. '_sysconfigdata_{abi}_{platform}_{multiarch}'.format(
  22. abi=sys.abiflags,
  23. diff --git a/Makefile.pre.in b/Makefile.pre.in
  24. index cd7d33d..ad6572f 100644
  25. --- a/Makefile.pre.in
  26. +++ b/Makefile.pre.in
  27. @@ -1301,7 +1301,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c
  28. esac; \
  29. done; \
  30. done
  31. - $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \
  32. + $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata*.py \
  33. $(DESTDIR)$(LIBDEST); \
  34. $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
  35. if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
  36. @@ -1436,7 +1436,7 @@ sharedinstall: sharedmods
  37. --install-scripts=$(BINDIR) \
  38. --install-platlib=$(DESTSHARED) \
  39. --root=$(DESTDIR)/
  40. - -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
  41. + -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata*.py
  42. -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
  43. # Here are a couple of targets for MacOSX again, to install a full
  44. diff --git a/configure b/configure
  45. index cf95b27..8203fbb 100755
  46. --- a/configure
  47. +++ b/configure
  48. @@ -14895,7 +14895,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
  49. $as_echo "$LDVERSION" >&6; }
  50. -if test x$PLATFORM_TRIPLET = x; then
  51. +if true ; then
  52. LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
  53. else
  54. LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
  55. diff --git a/configure.ac b/configure.ac
  56. index 1d63813..25f25ed 100644
  57. --- a/configure.ac
  58. +++ b/configure.ac
  59. @@ -4600,7 +4600,7 @@ AC_MSG_RESULT($LDVERSION)
  60. dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
  61. AC_SUBST(PY_ENABLE_SHARED)
  62. -if test x$PLATFORM_TRIPLET = x; then
  63. +if true ; then
  64. LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
  65. else
  66. LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"