765b7c8fe4
(bnc#857470, issue18045) - multilib patch: add "~/.local/lib64" paths to search path (bnc#637176) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=160
441 lines
17 KiB
Diff
441 lines
17 KiB
Diff
Index: Python-2.7.6/configure.ac
|
|
===================================================================
|
|
--- Python-2.7.6.orig/configure.ac 2013-11-10 08:36:41.000000000 +0100
|
|
+++ Python-2.7.6/configure.ac 2014-02-11 20:08:16.265571499 +0100
|
|
@@ -733,6 +733,41 @@
|
|
;;
|
|
esac
|
|
|
|
+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
|
|
+aarch64:yes | ppc64:yes | ppc64le:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
|
|
+ LIB="lib64"
|
|
+ ;;
|
|
+*:*)
|
|
+ LIB="lib"
|
|
+ ;;
|
|
+esac
|
|
+AC_MSG_RESULT($LIB)
|
|
|
|
AC_SUBST(LIBRARY)
|
|
AC_MSG_CHECKING(LIBRARY)
|
|
Index: Python-2.7.6/Include/pythonrun.h
|
|
===================================================================
|
|
--- Python-2.7.6.orig/Include/pythonrun.h 2013-11-10 08:36:39.000000000 +0100
|
|
+++ Python-2.7.6/Include/pythonrun.h 2014-02-11 20:08:16.265571499 +0100
|
|
@@ -108,6 +108,8 @@
|
|
/* In their own files */
|
|
PyAPI_FUNC(const char *) Py_GetVersion(void);
|
|
PyAPI_FUNC(const char *) Py_GetPlatform(void);
|
|
+PyAPI_FUNC(const char *) Py_GetArch(void);
|
|
+PyAPI_FUNC(const char *) Py_GetLib(void);
|
|
PyAPI_FUNC(const char *) Py_GetCopyright(void);
|
|
PyAPI_FUNC(const char *) Py_GetCompiler(void);
|
|
PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
|
|
Index: Python-2.7.6/Lib/distutils/command/install.py
|
|
===================================================================
|
|
--- Python-2.7.6.orig/Lib/distutils/command/install.py 2014-02-11 20:08:15.760568524 +0100
|
|
+++ Python-2.7.6/Lib/distutils/command/install.py 2014-02-11 20:08:16.265571499 +0100
|
|
@@ -22,6 +22,8 @@
|
|
from site import USER_SITE
|
|
|
|
|
|
+libname = sys.lib
|
|
+
|
|
if sys.version < "2.2":
|
|
WINDOWS_SCHEME = {
|
|
'purelib': '$base',
|
|
@@ -42,7 +44,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/$dist_name',
|
|
'scripts': '$base/bin',
|
|
'data' : '$base',
|
|
Index: Python-2.7.6/Lib/distutils/sysconfig.py
|
|
===================================================================
|
|
--- Python-2.7.6.orig/Lib/distutils/sysconfig.py 2013-11-10 08:36:40.000000000 +0100
|
|
+++ Python-2.7.6/Lib/distutils/sysconfig.py 2014-02-11 20:08:16.265571499 +0100
|
|
@@ -119,8 +119,11 @@
|
|
prefix = plat_specific and EXEC_PREFIX or PREFIX
|
|
|
|
if os.name == "posix":
|
|
- libpython = os.path.join(prefix,
|
|
- "lib", "python" + get_python_version())
|
|
+ if plat_specific or standard_lib:
|
|
+ lib = sys.lib
|
|
+ else:
|
|
+ lib = "lib"
|
|
+ libpython = os.path.join(prefix, lib, "python" + get_python_version())
|
|
if standard_lib:
|
|
return libpython
|
|
else:
|
|
Index: Python-2.7.6/Lib/pydoc.py
|
|
===================================================================
|
|
--- Python-2.7.6.orig/Lib/pydoc.py 2013-11-10 08:36:40.000000000 +0100
|
|
+++ Python-2.7.6/Lib/pydoc.py 2014-02-11 20:08:16.266571506 +0100
|
|
@@ -352,7 +352,7 @@
|
|
|
|
docloc = os.environ.get("PYTHONDOCS",
|
|
"http://docs.python.org/library")
|
|
- basedir = os.path.join(sys.exec_prefix, "lib",
|
|
+ basedir = os.path.join(sys.exec_prefix, sys.lib,
|
|
"python"+sys.version[0:3])
|
|
if (isinstance(object, type(os)) and
|
|
(object.__name__ in ('errno', 'exceptions', 'gc', 'imp',
|
|
Index: Python-2.7.6/Lib/site.py
|
|
===================================================================
|
|
--- Python-2.7.6.orig/Lib/site.py 2013-11-10 08:36:40.000000000 +0100
|
|
+++ Python-2.7.6/Lib/site.py 2014-02-11 20:12:51.208189992 +0100
|
|
@@ -231,29 +231,38 @@
|
|
USER_BASE = get_config_var('userbase')
|
|
return USER_BASE
|
|
|
|
-def getusersitepackages():
|
|
+def getusersitepackages(lib_kind = 'purelib'):
|
|
"""Returns the user-specific site-packages directory path.
|
|
|
|
If the global variable ``USER_SITE`` is not initialized yet, this
|
|
function will also set it.
|
|
"""
|
|
+
|
|
+ set_user_site = (lib_kind == 'purelib')
|
|
+
|
|
global USER_SITE
|
|
user_base = getuserbase() # this will also set USER_BASE
|
|
|
|
- if USER_SITE is not None:
|
|
+ if USER_SITE is not None and set_user_site:
|
|
return USER_SITE
|
|
|
|
from sysconfig import get_path
|
|
import os
|
|
|
|
+ user_site = None
|
|
+
|
|
if sys.platform == 'darwin':
|
|
from sysconfig import get_config_var
|
|
if get_config_var('PYTHONFRAMEWORK'):
|
|
- USER_SITE = get_path('purelib', 'osx_framework_user')
|
|
- return USER_SITE
|
|
+ user_site = get_path(lib_kind, 'osx_framework_user')
|
|
|
|
- USER_SITE = get_path('purelib', '%s_user' % os.name)
|
|
- return USER_SITE
|
|
+ if user_site is None:
|
|
+ user_site = get_path(lib_kind, '%s_user' % os.name)
|
|
+
|
|
+ if set_user_site:
|
|
+ USER_SITE = user_site
|
|
+
|
|
+ return user_site
|
|
|
|
def addusersitepackages(known_paths):
|
|
"""Add a per user site-package to sys.path
|
|
@@ -263,10 +272,12 @@
|
|
"""
|
|
# get the per user site-package path
|
|
# this call will also make sure USER_BASE and USER_SITE are set
|
|
- user_site = getusersitepackages()
|
|
+ for kind in ('purelib', 'platlib'):
|
|
+ user_site = getusersitepackages(kind)
|
|
+
|
|
+ if ENABLE_USER_SITE and os.path.isdir(user_site):
|
|
+ addsitedir(user_site, known_paths)
|
|
|
|
- if ENABLE_USER_SITE and os.path.isdir(user_site):
|
|
- addsitedir(user_site, known_paths)
|
|
return known_paths
|
|
|
|
def getsitepackages():
|
|
@@ -288,13 +299,18 @@
|
|
if sys.platform in ('os2emx', 'riscos'):
|
|
sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
|
|
elif os.sep == '/':
|
|
- sitepackages.append(os.path.join(prefix, "lib",
|
|
+ sitepackages.append(os.path.join(prefix, sys.lib,
|
|
"python" + sys.version[:3],
|
|
"site-packages"))
|
|
- sitepackages.append(os.path.join(prefix, "lib", "site-python"))
|
|
+ sitepackages.append(os.path.join(prefix, sys.lib, "site-python"))
|
|
+ if sys.lib != "lib":
|
|
+ sitepackages.append(os.path.join(prefix, "lib",
|
|
+ "python" + sys.version[:3],
|
|
+ "site-packages"))
|
|
+ sitepackages.append(os.path.join(prefix, "lib", "site-python"))
|
|
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.
|
|
Index: Python-2.7.6/Lib/sysconfig.py
|
|
===================================================================
|
|
--- Python-2.7.6.orig/Lib/sysconfig.py 2013-11-10 08:36:40.000000000 +0100
|
|
+++ Python-2.7.6/Lib/sysconfig.py 2014-02-11 20:08:16.266571506 +0100
|
|
@@ -7,10 +7,10 @@
|
|
|
|
_INSTALL_SCHEMES = {
|
|
'posix_prefix': {
|
|
- 'stdlib': '{base}/lib/python{py_version_short}',
|
|
- 'platstdlib': '{platbase}/lib/python{py_version_short}',
|
|
+ 'stdlib': '{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': '{base}/include/python{py_version_short}',
|
|
'platinclude': '{platbase}/include/python{py_version_short}',
|
|
'scripts': '{base}/bin',
|
|
@@ -65,10 +65,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}',
|
|
Index: Python-2.7.6/Lib/test/test_dl.py
|
|
===================================================================
|
|
--- Python-2.7.6.orig/Lib/test/test_dl.py 2013-11-10 08:36:40.000000000 +0100
|
|
+++ Python-2.7.6/Lib/test/test_dl.py 2014-02-11 20:08:16.266571506 +0100
|
|
@@ -5,10 +5,11 @@
|
|
import unittest
|
|
from test.test_support import verbose, import_module
|
|
dl = import_module('dl', deprecated=True)
|
|
+import sys
|
|
|
|
sharedlibs = [
|
|
- ('/usr/lib/libc.so', 'getpid'),
|
|
- ('/lib/libc.so.6', 'getpid'),
|
|
+ ('/usr/'+sys.lib+'/libc.so', 'getpid'),
|
|
+ ('/'+sys.lib+'/libc.so.6', 'getpid'),
|
|
('/usr/bin/cygwin1.dll', 'getpid'),
|
|
('/usr/lib/libc.dylib', 'getpid'),
|
|
]
|
|
Index: Python-2.7.6/Lib/test/test_site.py
|
|
===================================================================
|
|
--- Python-2.7.6.orig/Lib/test/test_site.py 2013-11-10 08:36:40.000000000 +0100
|
|
+++ Python-2.7.6/Lib/test/test_site.py 2014-02-11 20:08:16.266571506 +0100
|
|
@@ -241,12 +241,16 @@
|
|
self.assertEqual(dirs[2], wanted)
|
|
elif os.sep == '/':
|
|
# OS X non-framwework builds, Linux, FreeBSD, etc
|
|
- self.assertEqual(len(dirs), 2)
|
|
wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
|
|
'site-packages')
|
|
- self.assertEqual(dirs[0], wanted)
|
|
+ self.assertTrue(wanted in dirs)
|
|
wanted = os.path.join('xoxo', 'lib', 'site-python')
|
|
- self.assertEqual(dirs[1], wanted)
|
|
+ self.assertTrue(wanted in dirs)
|
|
+ wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3],
|
|
+ 'site-packages')
|
|
+ self.assertTrue(wanted in dirs)
|
|
+ wanted = os.path.join('xoxo', sys.lib, 'site-python')
|
|
+ self.assertTrue(wanted in dirs)
|
|
else:
|
|
# other platforms
|
|
self.assertEqual(len(dirs), 2)
|
|
Index: Python-2.7.6/Lib/trace.py
|
|
===================================================================
|
|
--- Python-2.7.6.orig/Lib/trace.py 2013-11-10 08:36:40.000000000 +0100
|
|
+++ Python-2.7.6/Lib/trace.py 2014-02-11 20:08:16.266571506 +0100
|
|
@@ -754,10 +754,10 @@
|
|
# should I also call expanduser? (after all, could use $HOME)
|
|
|
|
s = s.replace("$prefix",
|
|
- os.path.join(sys.prefix, "lib",
|
|
+ os.path.join(sys.prefix, sys.lib,
|
|
"python" + sys.version[:3]))
|
|
s = s.replace("$exec_prefix",
|
|
- os.path.join(sys.exec_prefix, "lib",
|
|
+ os.path.join(sys.exec_prefix, sys.lib,
|
|
"python" + sys.version[:3]))
|
|
s = os.path.normpath(s)
|
|
ignore_dirs.append(s)
|
|
Index: Python-2.7.6/Makefile.pre.in
|
|
===================================================================
|
|
--- Python-2.7.6.orig/Makefile.pre.in 2014-02-11 20:08:15.175565077 +0100
|
|
+++ Python-2.7.6/Makefile.pre.in 2014-02-11 20:08:16.267571511 +0100
|
|
@@ -87,6 +87,8 @@
|
|
|
|
# Machine-dependent subdirectories
|
|
MACHDEP= @MACHDEP@
|
|
+LIB= @LIB@
|
|
+ARCH= @ARCH@
|
|
|
|
# Multiarch directory (may be empty)
|
|
MULTIARCH= @MULTIARCH@
|
|
@@ -584,6 +586,7 @@
|
|
-DEXEC_PREFIX='"$(exec_prefix)"' \
|
|
-DVERSION='"$(VERSION)"' \
|
|
-DVPATH='"$(VPATH)"' \
|
|
+ -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' \
|
|
-o $@ $(srcdir)/Modules/getpath.c
|
|
|
|
Modules/python.o: $(srcdir)/Modules/python.c
|
|
@@ -626,7 +629,7 @@
|
|
Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
|
|
|
|
Python/getplatform.o: $(srcdir)/Python/getplatform.c
|
|
- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
|
|
+ $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c
|
|
|
|
Python/importdl.o: $(srcdir)/Python/importdl.c
|
|
$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
|
|
Index: Python-2.7.6/Modules/getpath.c
|
|
===================================================================
|
|
--- Python-2.7.6.orig/Modules/getpath.c 2013-11-10 08:36:41.000000000 +0100
|
|
+++ Python-2.7.6/Modules/getpath.c 2014-02-11 20:08:16.267571511 +0100
|
|
@@ -116,9 +116,11 @@
|
|
#define EXEC_PREFIX PREFIX
|
|
#endif
|
|
|
|
+#define LIB_PYTHON LIB "/python" VERSION
|
|
+
|
|
#ifndef PYTHONPATH
|
|
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
|
|
- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
|
|
+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \
|
|
+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload"
|
|
#endif
|
|
|
|
#ifndef LANDMARK
|
|
@@ -129,7 +131,7 @@
|
|
static char exec_prefix[MAXPATHLEN+1];
|
|
static char progpath[MAXPATHLEN+1];
|
|
static char *module_search_path = NULL;
|
|
-static char lib_python[] = "lib/python" VERSION;
|
|
+static char lib_python[] = LIB_PYTHON;
|
|
|
|
static void
|
|
reduce(char *dir)
|
|
Index: Python-2.7.6/Python/getplatform.c
|
|
===================================================================
|
|
--- Python-2.7.6.orig/Python/getplatform.c 2013-11-10 08:36:41.000000000 +0100
|
|
+++ Python-2.7.6/Python/getplatform.c 2014-02-11 20:08:16.267571511 +0100
|
|
@@ -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;
|
|
+}
|
|
Index: Python-2.7.6/Python/sysmodule.c
|
|
===================================================================
|
|
--- Python-2.7.6.orig/Python/sysmodule.c 2013-11-10 08:36:41.000000000 +0100
|
|
+++ Python-2.7.6/Python/sysmodule.c 2014-02-11 20:08:16.267571511 +0100
|
|
@@ -1419,6 +1419,10 @@
|
|
PyString_FromString(Py_GetCopyright()));
|
|
SET_SYS_FROM_STRING("platform",
|
|
PyString_FromString(Py_GetPlatform()));
|
|
+ SET_SYS_FROM_STRING("arch",
|
|
+ PyString_FromString(Py_GetArch()));
|
|
+ SET_SYS_FROM_STRING("lib",
|
|
+ PyString_FromString(Py_GetLib()));
|
|
SET_SYS_FROM_STRING("executable",
|
|
PyString_FromString(Py_GetProgramFullPath()));
|
|
SET_SYS_FROM_STRING("prefix",
|
|
Index: Python-2.7.6/setup.py
|
|
===================================================================
|
|
--- Python-2.7.6.orig/setup.py 2013-11-10 08:36:41.000000000 +0100
|
|
+++ Python-2.7.6/setup.py 2014-02-11 20:08:16.268571517 +0100
|
|
@@ -438,7 +438,7 @@
|
|
def detect_modules(self):
|
|
# Ensure that /usr/local is always used
|
|
if not cross_compiling:
|
|
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
|
+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/' + sys.lib)
|
|
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
|
if cross_compiling:
|
|
self.add_gcc_paths()
|
|
@@ -758,11 +758,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:
|
|
@@ -1910,18 +1910,17 @@
|
|
# Check for various platform-specific directories
|
|
if host_platform == 'sunos5':
|
|
include_dirs.append('/usr/openwin/include')
|
|
- added_lib_dirs.append('/usr/openwin/lib')
|
|
+ added_lib_dirs.append('/usr/openwin/' + sys.lib)
|
|
elif os.path.exists('/usr/X11R6/include'):
|
|
include_dirs.append('/usr/X11R6/include')
|
|
- added_lib_dirs.append('/usr/X11R6/lib64')
|
|
- added_lib_dirs.append('/usr/X11R6/lib')
|
|
+ added_lib_dirs.append('/usr/X11R6/' + sys.lib)
|
|
elif os.path.exists('/usr/X11R5/include'):
|
|
include_dirs.append('/usr/X11R5/include')
|
|
- added_lib_dirs.append('/usr/X11R5/lib')
|
|
+ added_lib_dirs.append('/usr/X11R5/' + sys.lib)
|
|
else:
|
|
# Assume default location for X11
|
|
include_dirs.append('/usr/X11/include')
|
|
- added_lib_dirs.append('/usr/X11/lib')
|
|
+ added_lib_dirs.append('/usr/X11/' + sys.lib)
|
|
|
|
# If Cygwin, then verify that X is installed before proceeding
|
|
if host_platform == 'cygwin':
|