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

   1 --- a/Lib/sysconfig.py
   2 +++ b/Lib/sysconfig.py
   3 @@ -407,6 +407,7 @@ def get_makefile_filename():
   4
   5
   6  def _get_sysconfigdata_name():
   7 +    return '_sysconfigdata'
   8      multiarch = getattr(sys.implementation, '_multiarch', '')
   9      return os.environ.get(
  10          '_PYTHON_SYSCONFIGDATA_NAME',
  11 --- a/Makefile.pre.in
  12 +++ b/Makefile.pre.in
  13 @@ -1594,7 +1594,7 @@ libinstall:       build_all $(srcdir)/Modules/
  14                         esac; \
  15                 done; \
  16         done
  17 -       $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \
  18 +       $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata*.py \
  19                 $(DESTDIR)$(LIBDEST); \
  20         $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
  21         if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
  22 @@ -1752,7 +1752,7 @@ sharedinstall: sharedmods
  23                 --install-scripts=$(BINDIR) \
  24                 --install-platlib=$(DESTSHARED) \
  25                 --root=$(DESTDIR)/
  26 -       -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
  27 +       -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata*.py
  28         -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
  29
  30  # Here are a couple of targets for MacOSX again, to install a full
  31 --- a/configure
  32 +++ b/configure
  33 @@ -3009,7 +3009,7 @@ $as_echo_n "checking for python interpre
  34         fi
  35          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5
  36  $as_echo "$interp" >&6; }
  37 -       PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp
  38 +       PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata '$interp
  39      fi
  40  elif test "$cross_compiling" = maybe; then
  41      as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
  42 @@ -15477,7 +15477,7 @@ fi
  43
  44
  45
  46 -if test x$PLATFORM_TRIPLET = x; then
  47 +if true ; then
  48    LIBPL='$(prefix)'"/${PLATLIBDIR}/python${VERSION}/config-${LDVERSION}"
  49  else
  50    LIBPL='$(prefix)'"/${PLATLIBDIR}/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
  51 --- a/configure.ac
  52 +++ b/configure.ac
  53 @@ -82,7 +82,7 @@ if test "$cross_compiling" = yes; then
  54             AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
  55         fi
  56          AC_MSG_RESULT($interp)
  57 -       PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp
  58 +       PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata '$interp
  59      fi
  60  elif test "$cross_compiling" = maybe; then
  61      AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
  62 @@ -4856,7 +4856,7 @@ fi],
  63
  64  dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
  65  AC_SUBST(PY_ENABLE_SHARED)
  66 -if test x$PLATFORM_TRIPLET = x; then
  67 +if true ; then
  68    LIBPL='$(prefix)'"/${PLATLIBDIR}/python${VERSION}/config-${LDVERSION}"
  69  else
  70    LIBPL='$(prefix)'"/${PLATLIBDIR}/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"