move pdb/profile/pstats from -devel-tools to -modules

[packages/python3.git] / python3-multilib.patch

diff --git a/python3-multilib.patch b/python3-multilib.patch
index 49417ceb9e5cc64eb4f854906040210cbfdb55a9..b8e2fbdbfadf0e156ecd37d18b0719659a7c3907 100644 (file)
--- a/python3-multilib.patch
+++ b/python3-multilib.patch
@@ -32,18 +32,36 @@ diff -urNp -x '*.orig' Python-3.9.2.org/Lib/distutils/tests/test_install.py Pyth
 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
+@@ -295,7 +295,7 @@
+     if sys.platform == 'darwin' and sys._framework:
+         return f'{userbase}/lib/python/site-packages'
+ 
+-    return f'{userbase}/lib/python{version[0]}.{version[1]}/site-packages'
++    return f'{userbase}/{sys.platlibdir}/python{version[0]}.{version[1]}/site-packages'
+ 
+ 
+ def getuserbase():
 @@ -344,6 +344,8 @@ def getsitepackages(prefixes=None):
                                      "python%d.%d" % sys.version_info[:2],
                                      "site-packages")
                  sitepackages.append(path)
 +            sitepackages.append(os.path.join(prefix, sys.platlibdir, "site-python"))
-+            sitepackages.append(os.path.join(prefix, "share", "python" + sys.version[:3], "site-packages"))
++            sitepackages.append(os.path.join(prefix, "share", "python%d.%d" % sys.version_info[:2], "site-packages"))
          else:
              sitepackages.append(prefix)
  
 diff -urNp -x '*.orig' Python-3.9.2.org/Lib/sysconfig.py Python-3.9.2/Lib/sysconfig.py
 --- Python-3.9.2.org/Lib/sysconfig.py  2021-02-19 13:31:44.000000000 +0100
 +++ Python-3.9.2/Lib/sysconfig.py      2021-02-25 18:40:00.705652346 +0100
+@@ -27,7 +27,7 @@
+     'posix_prefix': {
+         'stdlib': '{installed_base}/{platlibdir}/python{py_version_short}',
+         'platstdlib': '{platbase}/{platlibdir}/python{py_version_short}',
+-        'purelib': '{base}/lib/python{py_version_short}/site-packages',
++        'purelib': '{base}/share/python{py_version_short}/site-packages',
+         'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages',
+         'include':
+             '{installed_base}/include/python{py_version_short}{abiflags}',
 @@ -37,10 +37,10 @@ _INSTALL_SCHEMES = {
          'data': '{base}',
          },
@@ -54,7 +72,7 @@ diff -urNp -x '*.orig' Python-3.9.2.org/Lib/sysconfig.py Python-3.9.2/Lib/syscon
 -        'platlib': '{base}/lib/python',
 +        'stdlib': '{installed_base}/{platlibdir}/python',
 +        'platstdlib': '{base}/{platlibdir}/python',
-+        'purelib': '{base}/{platlibdir}/python',
++        'purelib': '{base}/share/python',
 +        'platlib': '{base}/{platlibdir}/python',
          'include': '{installed_base}/include/python',
          'platinclude': '{installed_base}/include/python',
@@ -65,7 +83,7 @@ diff -urNp -x '*.orig' Python-3.9.2.org/Lib/sysconfig.py Python-3.9.2/Lib/syscon
              'platstdlib': '{userbase}/{platlibdir}/python{py_version_short}',
 -            'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
 -            'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
-+            'purelib': '{userbase}/{platlibdir}/python{py_version_short}/site-packages',
++            'purelib': '{userbase}/share/python{py_version_short}/site-packages',
 +            'platlib': '{userbase}/{platlibdir}/python{py_version_short}/site-packages',
              'include': '{userbase}/include/python{py_version_short}',
              'scripts': '{userbase}/bin',
@@ -123,3 +141,22 @@ diff -urNp -x '*.orig' Python-3.9.2.org/setup.py Python-3.9.2/setup.py
                                 extra_link_args=readline_extra_link_args,
                                 libraries=readline_libs))
          else:
+--- 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
+@@ -299,13 +299,13 @@ class TestSysConfig(unittest.TestCase):
+                 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 != 'platlib':
+                     # Replace "/lib64/python3.11/site-packages" suffix
+                     # with "/lib/python3.11/site-packages".
+                     py_version_short = sysconfig.get_python_version()
+                     suffix = f'python{py_version_short}/site-packages'
+-                    expected = expected.replace(f'/{sys.platlibdir}/{suffix}',
+-                                                f'/lib/{suffix}')
++                    expected = expected.replace(f'/lib/{suffix}',
++                                                f'/{sys.platlibdir}/{suffix}')
+                 self.assertEqual(user_path, expected)
+ 
+     def test_main(self):