python-multilib.patch

diff -urNp -x '*.orig' Python-2.7.18.org/Include/pythonrun.h Python-2.7.18/Include/pythonrun.h
--- Python-2.7.18.org/Include/pythonrun.h	2020-04-19 23:13:39.000000000 +0200
+++ Python-2.7.18/Include/pythonrun.h	2021-09-26 12:34:29.851145003 +0200
@@ -108,6 +108,8 @@ PyAPI_FUNC(char *) Py_GetPath(void);
 /* 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);
diff -urNp -x '*.orig' Python-2.7.18.org/Lib/distutils/command/install.py Python-2.7.18/Lib/distutils/command/install.py
--- Python-2.7.18.org/Lib/distutils/command/install.py	2020-04-19 23:13:39.000000000 +0200
+++ Python-2.7.18/Lib/distutils/command/install.py	2021-09-26 12:34:29.851145003 +0200
@@ -22,6 +22,8 @@ from site import USER_BASE
 from site import USER_SITE
 
 
+libname = sys.lib
+
 if sys.version < "2.2":
     WINDOWS_SCHEME = {
         'purelib': '$base',
@@ -41,15 +43,15 @@ else:
 
 INSTALL_SCHEMES = {
     'unix_prefix': {
-        'purelib': '$base/lib/python$py_version_short/site-packages',
-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
+        'purelib': '$base/'+libname+'/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',
         },
     'unix_home': {
-        'purelib': '$base/lib/python',
-        'platlib': '$base/lib/python',
+        'purelib': '$base/'+libname+'/python',
+        'platlib': '$base/'+libname+'/python',
         'headers': '$base/include/python/$dist_name',
         'scripts': '$base/bin',
         'data'   : '$base',
diff -urNp -x '*.orig' Python-2.7.18.org/Lib/distutils/sysconfig.py Python-2.7.18/Lib/distutils/sysconfig.py
--- Python-2.7.18.org/Lib/distutils/sysconfig.py	2020-04-19 23:13:39.000000000 +0200
+++ Python-2.7.18/Lib/distutils/sysconfig.py	2021-09-26 12:34:29.851145003 +0200
@@ -129,8 +129,12 @@ def get_python_lib(plat_specific=0, stan
         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 or prefix != "/usr":
+            libpython = os.path.join(prefix,
+                                 sys.lib, "python" + get_python_version())
+        else:
+            libpython = os.path.join(prefix,
+                                 "share", "python" + get_python_version())
         if standard_lib:
             return libpython
         else:
diff -urNp -x '*.orig' Python-2.7.18.org/Lib/distutils/tests/test_install.py Python-2.7.18/Lib/distutils/tests/test_install.py
--- Python-2.7.18.org/Lib/distutils/tests/test_install.py	2020-04-19 23:13:39.000000000 +0200
+++ Python-2.7.18/Lib/distutils/tests/test_install.py	2021-09-26 12:34:29.851145003 +0200
@@ -57,7 +57,7 @@ class InstallTestCase(support.TempdirMan
             expected = os.path.normpath(expected)
             self.assertEqual(got, expected)
 
-        libdir = os.path.join(destination, "lib", "python")
+        libdir =  os.path.join(destination, sys.lib, "python")
         check_path(cmd.install_lib, libdir)
         check_path(cmd.install_platlib, libdir)
         check_path(cmd.install_purelib, libdir)
diff -urNp -x '*.orig' Python-2.7.18.org/Lib/site.py Python-2.7.18/Lib/site.py
--- Python-2.7.18.org/Lib/site.py	2020-04-19 23:13:39.000000000 +0200
+++ Python-2.7.18/Lib/site.py	2021-09-26 12:34:29.851145003 +0200
@@ -288,13 +288,18 @@ def getsitepackages():
         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"))
+            sitepackages.append(os.path.join(prefix, "share",
+                                        "python" + sys.version[:3],
+                                        "site-packages"))
+            sitepackages.append(os.path.join(prefix, "share", "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"))
     return sitepackages
 
 def addsitepackages(known_paths):
diff -urNp -x '*.orig' Python-2.7.18.org/Lib/sysconfig.py Python-2.7.18/Lib/sysconfig.py
--- Python-2.7.18.org/Lib/sysconfig.py	2020-04-19 23:13:39.000000000 +0200
+++ Python-2.7.18/Lib/sysconfig.py	2021-09-26 12:34:29.851145003 +0200
@@ -5,22 +5,24 @@ import sys
 import os
 from os.path import pardir, realpath
 
+libname = sys.lib
+
 _INSTALL_SCHEMES = {
     'posix_prefix': {
-        'stdlib': '{base}/lib/python{py_version_short}',
-        'platstdlib': '{platbase}/lib/python{py_version_short}',
-        'purelib': '{base}/lib/python{py_version_short}/site-packages',
-        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
+        'stdlib': '{base}/' + libname + '/python{py_version_short}',
+        'platstdlib': '{platbase}/' + libname + '/python{py_version_short}',
+        'purelib': '{base}/' + libname + '/python{py_version_short}/site-packages',
+        'platlib': '{platbase}/' + libname + '/python{py_version_short}/site-packages',
         'include': '{base}/include/python{py_version_short}',
         'platinclude': '{platbase}/include/python{py_version_short}',
         'scripts': '{base}/bin',
         'data': '{base}',
         },
     'posix_home': {
-        'stdlib': '{base}/lib/python',
-        'platstdlib': '{base}/lib/python',
-        'purelib': '{base}/lib/python',
-        'platlib': '{base}/lib/python',
+        'stdlib': '{base}/' + libname + '/python',
+        'platstdlib': '{base}/' + libname + '/python',
+        'purelib': '{base}/' + libname + '/python',
+        'platlib': '{base}/' + libname + '/python',
         'include': '{base}/include/python',
         'platinclude': '{base}/include/python',
         'scripts': '{base}/bin',
@@ -65,10 +67,10 @@ _INSTALL_SCHEMES = {
         'data'   : '{userbase}',
         },
     'posix_user': {
-        'stdlib': '{userbase}/lib/python{py_version_short}',
-        'platstdlib': '{userbase}/lib/python{py_version_short}',
-        'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
-        'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
+        'stdlib': '{userbase}/' + libname + '/python{py_version_short}',
+        'platstdlib': '{userbase}/' + libname + '/python{py_version_short}',
+        'purelib': '{userbase}/' + libname + '/python{py_version_short}/site-packages',
+        'platlib': '{userbase}/' + libname + '/python{py_version_short}/site-packages',
         'include': '{userbase}/include/python{py_version_short}',
         'scripts': '{userbase}/bin',
         'data'   : '{userbase}',
@@ -414,7 +416,7 @@ def get_config_h_filename():
         else:
             inc_dir = _PROJECT_BASE
     else:
-        inc_dir = get_path('platinclude')
+        inc_dir = os.path.join(get_path('platstdlib'), "config")
     return os.path.join(inc_dir, 'pyconfig.h')
 
 def get_scheme_names():
diff -urNp -x '*.orig' Python-2.7.18.org/Lib/test/test_site.py Python-2.7.18/Lib/test/test_site.py
--- Python-2.7.18.org/Lib/test/test_site.py	2020-04-19 23:13:39.000000000 +0200
+++ Python-2.7.18/Lib/test/test_site.py	2021-09-26 12:34:29.851145003 +0200
@@ -250,21 +250,21 @@ class HelperFunctionsTests(unittest.Test
 
         if sys.platform in ('os2emx', 'riscos'):
             self.assertEqual(len(dirs), 1)
-            wanted = os.path.join('xoxo', 'Lib', 'site-packages')
+            wanted = os.path.join('xoxo', sys.lib, 'site-packages')
             self.assertEqual(dirs[0], wanted)
         elif os.sep == '/':
             # OS X, Linux, FreeBSD, etc
-            self.assertEqual(len(dirs), 2)
-            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
+            self.assertEqual(len(dirs), 4)
+            wanted = os.path.join('xoxo', sys.lib, 'python' + sys.version[:3],
                                   'site-packages')
             self.assertEqual(dirs[0], wanted)
-            wanted = os.path.join('xoxo', 'lib', 'site-python')
+            wanted = os.path.join('xoxo', sys.lib, 'site-python')
             self.assertEqual(dirs[1], wanted)
         else:
             # other platforms
             self.assertEqual(len(dirs), 2)
             self.assertEqual(dirs[0], 'xoxo')
-            wanted = os.path.join('xoxo', 'lib', 'site-packages')
+            wanted = os.path.join('xoxo', sys.lib, 'site-packages')
             self.assertEqual(dirs[1], wanted)
 
     def test_no_home_directory(self):
diff -urNp -x '*.orig' Python-2.7.18.org/Makefile.pre.in Python-2.7.18/Makefile.pre.in
--- Python-2.7.18.org/Makefile.pre.in	2021-09-26 12:34:29.067802877 +0200
+++ Python-2.7.18/Makefile.pre.in	2021-09-26 12:34:29.851145003 +0200
@@ -91,6 +91,8 @@ PY_CFLAGS=	$(CFLAGS) $(CPPFLAGS) $(CFLAG
 
 # Machine-dependent subdirectories
 MACHDEP=	@MACHDEP@
+LIB=		@LIB@
+ARCH=		@ARCH@
 
 # Multiarch directory (may be empty)
 MULTIARCH=	@MULTIARCH@
@@ -110,7 +112,7 @@ LIBDIR=		@libdir@
 MANDIR=		@mandir@
 INCLUDEDIR=	@includedir@
 CONFINCLUDEDIR=	$(exec_prefix)/include
-SCRIPTDIR=	$(prefix)/lib
+SCRIPTDIR=	$(prefix)/$(LIB)
 
 # Detailed destination directories
 BINLIBDEST=	$(LIBDIR)/python$(VERSION)
@@ -701,7 +703,7 @@ regen-ast:
 Python/compile.o Python/symtable.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-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
diff -urNp -x '*.orig' Python-2.7.18.org/Modules/getpath.c Python-2.7.18/Modules/getpath.c
--- Python-2.7.18.org/Modules/getpath.c	2020-04-19 23:13:39.000000000 +0200
+++ Python-2.7.18/Modules/getpath.c	2021-09-26 12:34:29.851145003 +0200
@@ -95,6 +95,17 @@
  extern "C" {
 #endif
 
+#ifndef LIB_PYTHON
+#if defined(__x86_64__) || defined(__aarch64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__powerpc64__) || defined(__s390x__)
+#if defined(__ILP32__)
+#define LIB_PYTHON "libx32/python"
+#else
+#define LIB_PYTHON "lib64/python"
+#endif
+#else
+#define LIB_PYTHON "lib/python"
+#endif
+#endif
 
 #if !defined(PREFIX) || !defined(EXEC_PREFIX) || !defined(VERSION) || !defined(VPATH)
 #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
@@ -108,7 +119,7 @@ static char prefix[MAXPATHLEN+1];
 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 VERSION;
 
 static void
 reduce(char *dir)
diff -urNp -x '*.orig' Python-2.7.18.org/Python/getplatform.c Python-2.7.18/Python/getplatform.c
--- Python-2.7.18.org/Python/getplatform.c	2020-04-19 23:13:39.000000000 +0200
+++ Python-2.7.18/Python/getplatform.c	2021-09-26 12:34:29.851145003 +0200
@@ -10,3 +10,23 @@ Py_GetPlatform(void)
 {
 	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 -urNp -x '*.orig' Python-2.7.18.org/Python/sysmodule.c Python-2.7.18/Python/sysmodule.c
--- Python-2.7.18.org/Python/sysmodule.c	2020-04-19 23:13:39.000000000 +0200
+++ Python-2.7.18/Python/sysmodule.c	2021-09-26 12:34:29.851145003 +0200
@@ -1437,6 +1437,10 @@ _PySys_Init(void)
                         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",
diff -urNp -x '*.orig' Python-2.7.18.org/configure.ac Python-2.7.18/configure.ac
--- Python-2.7.18.org/configure.ac	2021-09-26 12:34:29.067802877 +0200
+++ Python-2.7.18/configure.ac	2021-09-26 12:34:29.851145003 +0200
@@ -773,6 +773,44 @@ SunOS*)
     ;;
 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
+powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes | aarch64:yes)
+  LIB="lib64"
+  ;;
+x86_64:no)
+  LIB="libx32"
+  ;;
+*:*)
+  LIB="lib"
+  ;;
+esac
+AC_MSG_RESULT($LIB)
 
 AC_SUBST(LIBRARY)
 AC_MSG_CHECKING(LIBRARY)
diff -urNp -x '*.orig' Python-2.7.18.org/setup.py Python-2.7.18/setup.py
--- Python-2.7.18.org/setup.py	2021-09-26 12:34:29.061136136 +0200
+++ Python-2.7.18/setup.py	2021-09-26 12:34:29.851145003 +0200
@@ -558,6 +558,7 @@ class PyBuildExt(build_ext):
         except NameError:
             have_unicode = 0
 
+        libname = sys.lib
         # lib_dirs and inc_dirs are used to search for files;
         # if a file is found in one of those directories, it can
         # be assumed that no additional -I,-L directives are needed.
@@ -569,8 +570,7 @@ class PyBuildExt(build_ext):
                 ):
                 add_dir_to_list(inc_dirs, d)
             for d in (
-                '/lib64', '/usr/lib64',
-                '/lib', '/usr/lib',
+                libname, '/usr/'+libname
                 ):
                 add_dir_to_list(lib_dirs, d)
         exts = []
@@ -828,11 +828,11 @@ class PyBuildExt(build_ext):
             elif curses_library:
                 readline_libs.append(curses_library)
             elif self.compiler.find_library_file(lib_dirs +
-                                                     ['/usr/lib/termcap'],
+                                                     ['/usr' + libname + '/termcap'],
                                                      'termcap'):
                 readline_libs.append('termcap')
             exts.append( Extension('readline', ['readline.c'],
-                                   library_dirs=['/usr/lib/termcap'],
+                                   library_dirs=['/usr' + libname + '/termcap'],
                                    extra_link_args=readline_extra_link_args,
                                    libraries=readline_libs) )
         else:
@@ -1986,8 +1986,8 @@ class PyBuildExt(build_ext):
             added_lib_dirs.append('/usr/openwin/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)
+            #added_lib_dirs.append('/usr/X11R6/lib')
         elif os.path.exists('/usr/X11R5/include'):
             include_dirs.append('/usr/X11R5/include')
             added_lib_dirs.append('/usr/X11R5/lib')