Djam/python3.11
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/python3.11.git synced 2025-02-23 18:22:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
python3.11/python3-3.5.2-multilib.patch
Denis Silakov 39ee7b3b99 Fix pure get_python_version in distutils
2018-02-23 09:03:49 +03:00

340 lines
14 KiB
Diff
Raw Blame History

diff -Naur Python-3.5.2.orig/configure.ac Python-3.5.2.new/configure.ac
--- Python-3.5.2.orig/configure.ac 2018-02-14 17:15:38.443097227 +0300
+++ Python-3.5.2.new/configure.ac 2018-02-14 17:17:45.846734280 +0300
@@ -876,6 +876,41 @@
AC_SUBST(PLATDIR)
AC_SUBST(PLATFORM_TRIPLET)
+AC_SUBST(ARCH)
+AC_MSG_CHECKING(ARCH)
+ARCH=`uname -m`
+case $ARCH in
+i?86) ARCH=i386;;
+esac
+AC_MSG_RESULT($ARCH)
+
+AC_SUBST(LIB)
+AC_MSG_CHECKING(LIB)
+case $ac_sys_system in
+Linux*)
+ # Test if the compiler is 64bit
+ echo 'int i;' > conftest.$ac_ext
+ python_cv_cc_64bit_output=no
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *"ELF 64"*)
+ python_cv_cc_64bit_output=yes
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+esac
+
+case $ARCH:$python_cv_cc_64bit_output in
+ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
+ LIB="lib64"
+ ;;
+*:*)
+ LIB="lib"
+ ;;
+esac
+AC_MSG_RESULT($LIB)
AC_MSG_CHECKING([for -Wl,--no-as-needed])
save_LDFLAGS="$LDFLAGS"
diff -Naur Python-3.5.2.orig/Include/pythonrun.h Python-3.5.2.new/Include/pythonrun.h
--- Python-3.5.2.orig/Include/pythonrun.h 2018-02-14 17:15:38.393097369 +0300
+++ Python-3.5.2.new/Include/pythonrun.h 2018-02-14 17:17:45.844734286 +0300
@@ -23,6 +23,9 @@
} PyCompilerFlags;
#endif
+PyAPI_FUNC(const char *) Py_GetArch(void);
+PyAPI_FUNC(const char *) Py_GetLib(void);
+
#ifndef Py_LIMITED_API
PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *);
PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *);
diff -Naur Python-3.5.2.orig/Lib/distutils/command/install.py Python-3.5.2.new/Lib/distutils/command/install.py
--- Python-3.5.2.orig/Lib/distutils/command/install.py 2018-02-14 17:15:38.465097164 +0300
+++ Python-3.5.2.new/Lib/distutils/command/install.py 2018-02-14 17:17:45.844734286 +0300
@@ -19,6 +19,8 @@
from site import USER_SITE
HAS_USER_SITE = True
+libname = sys.lib
+
WINDOWS_SCHEME = {
'purelib': '$base/Lib/site-packages',
'platlib': '$base/Lib/site-packages',
@@ -30,7 +32,7 @@
INSTALL_SCHEMES = {
'unix_prefix': {
'purelib': '$base/lib/python$py_version_short/site-packages',
- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
+ 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages',
'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
diff -Naur Python-3.5.2.orig/Lib/distutils/sysconfig.py Python-3.5.2.new/Lib/distutils/sysconfig.py
--- Python-3.5.2.orig/Lib/distutils/sysconfig.py 2018-02-14 17:15:38.465097164 +0300
+++ Python-3.5.2.new/Lib/distutils/sysconfig.py 2018-02-15 13:37:37.327823379 +0300
@@ -132,8 +132,12 @@
prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
+ if plat_specific:
+ lib = sys.lib
+ else:
+ lib = 'lib'
libpython = os.path.join(prefix,
- "lib", "python" + get_python_version())
+ lib, "python" + get_python_version())
if standard_lib:
return libpython
else:
diff -Naur Python-3.5.2.orig/Lib/pydoc.py Python-3.5.2.new/Lib/pydoc.py
--- Python-3.5.2.orig/Lib/pydoc.py 2018-02-14 17:15:38.463097169 +0300
+++ Python-3.5.2.new/Lib/pydoc.py 2018-02-14 17:17:45.845734283 +0300
@@ -384,7 +384,7 @@
docmodule = docclass = docroutine = docother = docproperty = docdata = fail
def getdocloc(self, object,
- basedir=os.path.join(sys.base_exec_prefix, "lib",
+ basedir=os.path.join(sys.base_exec_prefix, sys.lib,
"python%d.%d" % sys.version_info[:2])):
"""Return the location of module docs or None"""
diff -Naur Python-3.5.2.orig/Lib/site.py Python-3.5.2.new/Lib/site.py
--- Python-3.5.2.orig/Lib/site.py 2018-02-14 17:15:38.455097192 +0300
+++ Python-3.5.2.new/Lib/site.py 2018-02-15 12:44:40.357844949 +0300
@@ -303,12 +303,16 @@
seen.add(prefix)
if os.sep == '/':
- sitepackages.append(os.path.join(prefix, "lib",
+ sitepackages.append(os.path.join(prefix, sys.lib,
"python" + sys.version[:3],
"site-packages"))
+ if sys.lib != 'lib':
+ sitepackages.append(os.path.join(prefix, 'lib',
+ "python" + sys.version[:3],
+ "site-packages"))
else:
sitepackages.append(prefix)
- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
+ sitepackages.append(os.path.join(prefix, sys.lib, "site-packages"))
if sys.platform == "darwin":
# for framework builds *only* we add the standard Apple
# locations.
diff -Naur Python-3.5.2.orig/Lib/sysconfig.py Python-3.5.2.new/Lib/sysconfig.py
--- Python-3.5.2.orig/Lib/sysconfig.py 2018-02-14 17:15:38.462097172 +0300
+++ Python-3.5.2.new/Lib/sysconfig.py 2018-02-14 17:17:45.845734283 +0300
@@ -20,10 +20,10 @@
_INSTALL_SCHEMES = {
'posix_prefix': {
- 'stdlib': '{installed_base}/lib/python{py_version_short}',
- 'platstdlib': '{platbase}/lib/python{py_version_short}',
+ 'stdlib': '{installed_base}/'+sys.lib+'/python{py_version_short}',
+ 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}',
'purelib': '{base}/lib/python{py_version_short}/site-packages',
- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
+ 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages',
'include':
'{installed_base}/include/python{py_version_short}{abiflags}',
'platinclude':
@@ -32,10 +32,10 @@
'data': '{base}',
},
'posix_home': {
- 'stdlib': '{installed_base}/lib/python',
- 'platstdlib': '{base}/lib/python',
+ 'stdlib': '{installed_base}/'+sys.lib+'/python',
+ 'platstdlib': '{base}/'+sys.lib+'/python',
'purelib': '{base}/lib/python',
- 'platlib': '{base}/lib/python',
+ 'platlib': '{base}/'+sys.lib+'/python',
'include': '{installed_base}/include/python',
'platinclude': '{installed_base}/include/python',
'scripts': '{base}/bin',
@@ -61,10 +61,10 @@
'data': '{userbase}',
},
'posix_user': {
- 'stdlib': '{userbase}/lib/python{py_version_short}',
- 'platstdlib': '{userbase}/lib/python{py_version_short}',
+ 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
+ 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
+ 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages',
'include': '{userbase}/include/python{py_version_short}',
'scripts': '{userbase}/bin',
'data': '{userbase}',
diff -Naur Python-3.5.2.orig/Lib/trace.py Python-3.5.2.new/Lib/trace.py
--- Python-3.5.2.orig/Lib/trace.py 2018-02-14 17:15:38.461097175 +0300
+++ Python-3.5.2.new/Lib/trace.py 2018-02-14 17:17:45.845734283 +0300
@@ -749,10 +749,10 @@
# should I also call expanduser? (after all, could use $HOME)
s = s.replace("$prefix",
- os.path.join(sys.base_prefix, "lib",
+ os.path.join(sys.base_prefix, sys.lib,
"python" + sys.version[:3]))
s = s.replace("$exec_prefix",
- os.path.join(sys.base_exec_prefix, "lib",
+ os.path.join(sys.base_exec_prefix, sys.lib,
"python" + sys.version[:3]))
s = os.path.normpath(s)
ignore_dirs.append(s)
diff -Naur Python-3.5.2.orig/Makefile.pre.in Python-3.5.2.new/Makefile.pre.in
--- Python-3.5.2.orig/Makefile.pre.in 2018-02-14 17:15:38.394097367 +0300
+++ Python-3.5.2.new/Makefile.pre.in 2018-02-14 17:17:45.845734283 +0300
@@ -106,6 +106,8 @@
# Machine-dependent subdirectories
MACHDEP= @MACHDEP@
+LIB= @LIB@
+ARCH= @ARCH@
# Multiarch directory (may be empty)
MULTIARCH= @MULTIARCH@
@@ -125,7 +127,7 @@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
-SCRIPTDIR= $(prefix)/lib
+SCRIPTDIR= @libdir@
ABIFLAGS= @ABIFLAGS@
# Detailed destination directories
@@ -753,6 +755,7 @@
-DEXEC_PREFIX='"$(exec_prefix)"' \
-DVERSION='"$(VERSION)"' \
-DVPATH='"$(VPATH)"' \
+ -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' \
-o $@ $(srcdir)/Modules/getpath.c
Programs/python.o: $(srcdir)/Programs/python.c
@@ -833,7 +836,7 @@
Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
Python/getplatform.o: $(srcdir)/Python/getplatform.c
- $(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
+ $(CC) -c $(PY_CORE_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c
Python/importdl.o: $(srcdir)/Python/importdl.c
$(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
diff -Naur Python-3.5.2.orig/Modules/getpath.c Python-3.5.2.new/Modules/getpath.c
--- Python-3.5.2.orig/Modules/getpath.c 2018-02-14 17:15:38.427097272 +0300
+++ Python-3.5.2.new/Modules/getpath.c 2018-02-14 17:17:45.845734283 +0300
@@ -105,6 +105,13 @@
#error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
#endif
+#define LIB_PYTHON LIB "/python" VERSION
+
+#ifndef PYTHONPATH
+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
+#endif
+
#ifndef LANDMARK
#define LANDMARK L"os.py"
#endif
@@ -113,6 +120,7 @@
static wchar_t exec_prefix[MAXPATHLEN+1];
static wchar_t progpath[MAXPATHLEN+1];
static wchar_t *module_search_path = NULL;
+static wchar_t *lib_python = L"" LIB_PYTHON;
/* Get file status. Encode the path to the locale encoding. */
@@ -494,7 +502,7 @@
_pythonpath = Py_DecodeLocale(PYTHONPATH, NULL);
_prefix = Py_DecodeLocale(PREFIX, NULL);
_exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL);
- lib_python = Py_DecodeLocale("lib/python" VERSION, NULL);
+ lib_python = Py_DecodeLocale(LIB_PYTHON, NULL);
if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
Py_FatalError(
diff -Naur Python-3.5.2.orig/Python/getplatform.c Python-3.5.2.new/Python/getplatform.c
--- Python-3.5.2.orig/Python/getplatform.c 2018-02-14 17:15:38.447097215 +0300
+++ Python-3.5.2.new/Python/getplatform.c 2018-02-14 17:17:45.845734283 +0300
@@ -10,3 +10,23 @@
{
return PLATFORM;
}
+
+#ifndef ARCH
+#define ARCH "unknown"
+#endif
+
+const char *
+Py_GetArch(void)
+{
+ return ARCH;
+}
+
+#ifndef LIB
+#define LIB "lib"
+#endif
+
+const char *
+Py_GetLib(void)
+{
+ return LIB;
+}
diff -Naur Python-3.5.2.orig/Python/sysmodule.c Python-3.5.2.new/Python/sysmodule.c
--- Python-3.5.2.orig/Python/sysmodule.c 2018-02-14 17:15:38.447097215 +0300
+++ Python-3.5.2.new/Python/sysmodule.c 2018-02-14 17:17:45.845734283 +0300
@@ -1790,6 +1790,10 @@
PyUnicode_FromString(Py_GetCopyright()));
SET_SYS_FROM_STRING("platform",
PyUnicode_FromString(Py_GetPlatform()));
+ SET_SYS_FROM_STRING("arch",
+ PyUnicode_FromString(Py_GetArch()));
+ SET_SYS_FROM_STRING("lib",
+ PyUnicode_FromString(Py_GetLib()));
SET_SYS_FROM_STRING("executable",
PyUnicode_FromWideChar(
Py_GetProgramFullPath(), -1));
diff -Naur Python-3.5.2.orig/setup.py Python-3.5.2.new/setup.py
--- Python-3.5.2.orig/setup.py 2018-02-14 17:15:38.447097215 +0300
+++ Python-3.5.2.new/setup.py 2018-02-14 17:17:45.846734280 +0300
@@ -492,7 +492,7 @@
# directories (i.e. '.' and 'Include') must be first. See issue
# 10520.
if not cross_compiling:
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+ add_dir_to_list(self.compiler.library_dirs, os.path.join('/usr/local', sys.lib))
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
# only change this for cross builds for 3.3, issues on Mageia
if cross_compiling:
@@ -549,8 +549,7 @@
# be assumed that no additional -I,-L directives are needed.
if not cross_compiling:
lib_dirs = self.compiler.library_dirs + [
- '/lib64', '/usr/lib64',
- '/lib', '/usr/lib',
+ '/' + sys.lib, '/usr/' + sys.lib,
]
inc_dirs = self.compiler.include_dirs + ['/usr/include']
else:
@@ -780,11 +779,11 @@
elif curses_library:
readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs +
- ['/usr/lib/termcap'],
+ ['/usr/'+sys.lib+'/termcap'],
'termcap'):
readline_libs.append('termcap')
exts.append( Extension('readline', ['readline.c'],
- library_dirs=['/usr/lib/termcap'],
+ library_dirs=['/usr/'+sys.lib+'/termcap'],
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
Reference in a new issue View git blame Copy permalink