You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

62 lines
2.2 KiB

  1. --- a/Lib/distutils/sysconfig.py
  2. +++ b/Lib/distutils/sysconfig.py
  3. @@ -446,6 +446,7 @@ def _init_posix():
  4. platform=sys.platform,
  5. multiarch=getattr(sys.implementation, '_multiarch', ''),
  6. ))
  7. + name = '_sysconfigdata'
  8. _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
  9. build_time_vars = _temp.build_time_vars
  10. global _config_vars
  11. --- a/Lib/sysconfig.py
  12. +++ b/Lib/sysconfig.py
  13. @@ -344,6 +344,7 @@ def get_makefile_filename():
  14. def _get_sysconfigdata_name():
  15. + return '_sysconfigdata'
  16. return os.environ.get('_PYTHON_SYSCONFIGDATA_NAME',
  17. '_sysconfigdata_{abi}_{platform}_{multiarch}'.format(
  18. abi=sys.abiflags,
  19. --- a/Makefile.pre.in
  20. +++ b/Makefile.pre.in
  21. @@ -1400,7 +1400,7 @@ libinstall: build_all $(srcdir)/Modules/
  22. esac; \
  23. done; \
  24. done
  25. - $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \
  26. + $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata*.py \
  27. $(DESTDIR)$(LIBDEST); \
  28. $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
  29. ifeq (@COMPILE_ALL_TESTS@,yes)
  30. @@ -1545,7 +1545,7 @@ sharedinstall: sharedmods
  31. --install-scripts=$(BINDIR) \
  32. --install-platlib=$(DESTSHARED) \
  33. --root=$(DESTDIR)/
  34. - -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
  35. + -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata*.py
  36. -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
  37. # Here are a couple of targets for MacOSX again, to install a full
  38. --- a/configure
  39. +++ b/configure
  40. @@ -15292,7 +15292,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
  41. $as_echo "$LDVERSION" >&6; }
  42. -if test x$PLATFORM_TRIPLET = x; then
  43. +if true ; then
  44. LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
  45. else
  46. LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
  47. --- a/configure.ac
  48. +++ b/configure.ac
  49. @@ -4753,7 +4753,7 @@ AC_MSG_RESULT($LDVERSION)
  50. dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
  51. AC_SUBST(PY_ENABLE_SHARED)
  52. -if test x$PLATFORM_TRIPLET = x; then
  53. +if true ; then
  54. LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
  55. else
  56. LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"