diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2019-12-01 20:18:01 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2019-12-01 20:18:01 +0300 |
| commit | 77d81aa4a3747b7dfbb17e43b16e1a514550c60c (patch) | |
| tree | 0679778b3a5b46cb96d7c57485c847b83cc78bbf /debian/patches/sysconfigdata-name.diff | |
| parent | c089c4500b0b78acf03ee5405ad250a84b0dfa66 (diff) | |
| download | python3.8-debian.tar.gz | |
Import python3.8 (3.8.0-5)debian/3.8.0-5debian
Diffstat (limited to 'debian/patches/sysconfigdata-name.diff')
| -rw-r--r-- | debian/patches/sysconfigdata-name.diff | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/debian/patches/sysconfigdata-name.diff b/debian/patches/sysconfigdata-name.diff new file mode 100644 index 0000000..d8dea8b --- /dev/null +++ b/debian/patches/sysconfigdata-name.diff @@ -0,0 +1,60 @@ +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -345,9 +345,8 @@ def get_makefile_filename(): + + def _get_sysconfigdata_name(): + return os.environ.get('_PYTHON_SYSCONFIGDATA_NAME', +- '_sysconfigdata_{abi}_{platform}_{multiarch}'.format( ++ '_sysconfigdata_{abi}_{multiarch}'.format( + abi=sys.abiflags, +- platform=sys.platform, + multiarch=getattr(sys.implementation, '_multiarch', ''), + )) + +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1463,8 +1463,10 @@ libinstall: build_all $(srcdir)/Modules/ + esac; \ + done; \ + done +- $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \ +- $(DESTDIR)$(LIBDEST); \ ++ $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MULTIARCH).py \ ++ $(DESTDIR)$(LIBDEST) ++ $(LN) -s _sysconfigdata_$(ABIFLAGS)_$(MULTIARCH).py \ ++ $(DESTDIR)$(LIBDEST)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py + $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt + if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \ + $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ +@@ -1619,6 +1621,7 @@ sharedinstall: sharedmods + --install-scripts=$(BINDIR) \ + --install-platlib=$(DESTSHARED) \ + --root=$(DESTDIR)/ ++ -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MULTIARCH).py + -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py + -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__ + +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -459,9 +459,8 @@ def _init_posix(): + """Initialize the module as appropriate for POSIX systems.""" + # _sysconfigdata is generated at build time, see the sysconfig module + name = os.environ.get('_PYTHON_SYSCONFIGDATA_NAME', +- '_sysconfigdata_{abi}_{platform}_{multiarch}'.format( ++ '_sysconfigdata_{abi}_{multiarch}'.format( + abi=sys.abiflags, +- platform=sys.platform, + multiarch=getattr(sys.implementation, '_multiarch', ''), + )) + _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) +--- a/configure.ac ++++ b/configure.ac +@@ -75,7 +75,7 @@ if test "$cross_compiling" = yes; then + AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) + fi + AC_MSG_RESULT($interp) +- 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 ++ 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)_$(MULTIARCH) '$interp + fi + elif test "$cross_compiling" = maybe; then + AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) |