lang/python/python3/patches/016-adjust-config-paths.patch

   1 --- a/Lib/distutils/sysconfig.py
   2 +++ b/Lib/distutils/sysconfig.py
   3 @@ -421,6 +421,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 @@ -343,6 +343,7 @@ def get_makefile_filename():
  14
  15
  16  def _get_sysconfigdata_name():
  17 +    return '_sysconfigdata'
  18      return os.environ.get('_PYTHON_SYSCONFIGDATA_NAME',
  19          '_sysconfigdata_{abi}_{platform}_{multiarch}'.format(
  20          abi=sys.abiflags,
  21 --- a/Makefile.pre.in
  22 +++ b/Makefile.pre.in
  23 @@ -1304,7 +1304,7 @@ libinstall:       build_all $(srcdir)/Modules/
  24                         esac; \
  25                 done; \
  26         done
  27 -       $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \
  28 +       $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata*.py \
  29                 $(DESTDIR)$(LIBDEST); \
  30         $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
  31
  32 @@ -1404,7 +1404,7 @@ sharedinstall: sharedmods
  33                 --install-scripts=$(BINDIR) \
  34                 --install-platlib=$(DESTSHARED) \
  35                 --root=$(DESTDIR)/
  36 -       -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
  37 +       -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata*.py
  38         -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
  39
  40  # Here are a couple of targets for MacOSX again, to install a full
  41 --- a/configure
  42 +++ b/configure
  43 @@ -15005,7 +15005,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
  44  $as_echo "$LDVERSION" >&6; }
  45
  46
  47 -if test x$PLATFORM_TRIPLET = x; then
  48 +if true ; then
  49    LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
  50  else
  51    LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
  52 --- a/configure.ac
  53 +++ b/configure.ac
  54 @@ -4656,7 +4656,7 @@ AC_MSG_RESULT($LDVERSION)
  55
  56  dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
  57  AC_SUBST(PY_ENABLE_SHARED)
  58 -if test x$PLATFORM_TRIPLET = x; then
  59 +if true ; then
  60    LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
  61  else
  62    LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"