python3-multilib.patch

diff -urNp -x '*.orig' Python-3.9.2.org/Lib/site.py Python-3.9.2/Lib/site.py
--- Python-3.9.2.org/Lib/site.py	2021-02-19 13:31:44.000000000 +0100
+++ Python-3.9.2/Lib/site.py	2021-02-25 18:40:00.705652346 +0100
@@ -769,6 +769,8 @@ def getsitepackages(prefixes=None):
                                     f"{implementation}{ver[0]}.{ver[1]}{abi_thread}",
                                     "site-packages")
                 sitepackages.append(path)
+                sitepackages.append(os.path.join(prefix, sys.platlibdir, "site-python"))
+                sitepackages.append(os.path.join(prefix, "share", f"{implementation}{ver[0]}.{ver[1]}{abi_thread}", "site-packages"))
         else:
             sitepackages.append(prefix)
             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
diff -urNp -x '*.orig' Python-3.9.2.org/Lib/sysconfig/__init__.py Python-3.9.2/Lib/sysconfig/__init__.py
--- Python-3.9.2.org/Lib/sysconfig/__init__.py	2021-02-19 13:31:44.000000000 +0100
+++ Python-3.9.2/Lib/sysconfig/__init__.py	2021-02-25 18:40:00.705652346 +0100
@@ -29,7 +29,7 @@ _INSTALL_SCHEMES = {
     'posix_prefix': {
         'stdlib': '{installed_base}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}',
         'platstdlib': '{platbase}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}',
-        'purelib': '{base}/lib/{implementation_lower}{py_version_short}{abi_thread}/site-packages',
+        'purelib': '{base}/share/{implementation_lower}{py_version_short}{abi_thread}/site-packages',
         'platlib': '{platbase}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}/site-packages',
         'include':
             '{installed_base}/include/{implementation_lower}{py_version_short}{abiflags}',
@@ -39,10 +39,10 @@ _INSTALL_SCHEMES = {
         'data': '{base}',
         },
     'posix_home': {
-        'stdlib': '{installed_base}/lib/{implementation_lower}',
-        'platstdlib': '{base}/lib/{implementation_lower}',
-        'purelib': '{base}/lib/{implementation_lower}',
-        'platlib': '{base}/lib/{implementation_lower}',
+        'stdlib': '{installed_base}/{platlibdir}/{implementation_lower}',
+        'platstdlib': '{base}/{platlibdir}/{implementation_lower}',
+        'purelib': '{base}/share/{implementation_lower}',
+        'platlib': '{base}/{platlibdir}/{implementation_lower}',
         'include': '{installed_base}/include/{implementation_lower}',
         'platinclude': '{installed_base}/include/{implementation_lower}',
         'scripts': '{base}/bin',
@@ -470,7 +470,7 @@ def get_config_h_filename():
         else:
             inc_dir = _PROJECT_BASE
     else:
-        inc_dir = get_path('platinclude')
+        inc_dir = os.path.dirname(get_makefile_filename())
     return os.path.join(inc_dir, 'pyconfig.h')
 
 
--- Python-3.10.0/Makefile.pre.in~	2021-10-04 19:40:46.000000000 +0200
+++ Python-3.10.0/Makefile.pre.in	2021-10-20 22:21:30.573156183 +0200
@@ -1707,9 +1707,9 @@ libainstall:	@DEF_MAKE_RULE@ python-conf
 		if test -d $(LIBRARY); then :; else \
 			if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
 				if test "$(SHLIB_SUFFIX)" = .dll; then \
-					$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
+					$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBDIR) ; \
 				else \
-					$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
+					$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBDIR)/$(LIBRARY) ; \
 				fi; \
 			else \
 				echo Skip install of $(LIBRARY) - use make frameworkinstall; \
--- Python-3.10.6/Lib/test/test_sysconfig.py.orig	2022-08-22 06:15:16.895139554 +0200
+++ Python-3.10.6/Lib/test/test_sysconfig.py	2022-08-22 06:18:57.331178879 +0200
@@ -430,13 +430,16 @@ class TestSysConfig(unittest.TestCase, V
                 expected = os.path.normpath(global_path.replace(base, user, 1))
                 # bpo-44860: platlib of posix_user doesn't use sys.platlibdir,
                 # whereas posix_prefix does.
-                if name == 'platlib':
+                if name in ('platlib', 'purelib'):
                     # Replace "/lib64/python3.11/site-packages" suffix
                     # with "/lib/python3.11/site-packages".
                     py_version_abi = sysconfig._get_python_version_abi()
                     suffix = f'python{py_version_abi}/site-packages'
                     expected = expected.replace(f'/{sys.platlibdir}/{suffix}',
                                                 f'/lib/{suffix}')
+                    # posix_prefix keeps purelib in share/
+                    expected = expected.replace(f'/share/{suffix}',
+                                                f'/lib/{suffix}')
                 self.assertEqual(user_path, expected)
 
     def test_main(self):