diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2019-12-01 17:44:24 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2019-12-01 17:44:24 +0300 |
| commit | c089c4500b0b78acf03ee5405ad250a84b0dfa66 (patch) | |
| tree | 23870848d194569aff6e0e4e41bc7907960b1af1 /debian/patches/multiarch.diff | |
| parent | 377002e7300431b68f3548d9fd2c7f99cf883939 (diff) | |
| download | python3.7-debian.tar.gz | |
Import python3.7 (3.7.5-2)debian/3.7.5-2debian
Diffstat (limited to 'debian/patches/multiarch.diff')
| -rw-r--r-- | debian/patches/multiarch.diff | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/debian/patches/multiarch.diff b/debian/patches/multiarch.diff index dace3f5..cdd5290 100644 --- a/debian/patches/multiarch.diff +++ b/debian/patches/multiarch.diff @@ -1,8 +1,6 @@ -Index: b/Lib/sysconfig.py -=================================================================== --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -557,6 +557,12 @@ def get_config_vars(*args): +@@ -558,6 +558,12 @@ def get_config_vars(*args): # the init-function. _CONFIG_VARS['userbase'] = _getuserbase() @@ -15,11 +13,9 @@ Index: b/Lib/sysconfig.py # Always convert srcdir to an absolute path srcdir = _CONFIG_VARS.get('srcdir', _PROJECT_BASE) if os.name == 'posix': -Index: b/Lib/distutils/sysconfig.py -=================================================================== --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py -@@ -99,6 +99,9 @@ def get_python_inc(plat_specific=0, pref +@@ -112,6 +112,9 @@ def get_python_inc(plat_specific=0, pref incdir = os.path.join(get_config_var('srcdir'), 'Include') return os.path.normpath(incdir) python_dir = 'python' + get_python_version() + build_flags @@ -28,12 +24,10 @@ Index: b/Lib/distutils/sysconfig.py + return sysconfig.get_path('platinclude') return os.path.join(prefix, "include", python_dir) elif os.name == "nt": - return os.path.join(prefix, "include") -Index: b/Makefile.pre.in -=================================================================== + if python_build: --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -760,6 +760,7 @@ Modules/signalmodule.o: $(srcdir)/Module +@@ -794,6 +794,7 @@ Modules/signalmodule.o: $(srcdir)/Module Python/dynload_shlib.o: $(srcdir)/Python/dynload_shlib.c Makefile $(CC) -c $(PY_CORE_CFLAGS) \ @@ -41,7 +35,7 @@ Index: b/Makefile.pre.in -DSOABI='"$(SOABI)"' \ -o $@ $(srcdir)/Python/dynload_shlib.c -@@ -1404,7 +1405,7 @@ inclinstall: +@@ -1477,7 +1478,7 @@ inclinstall: LIBPL= @LIBPL@ # pkgconfig directory |