X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=python3-multilib.patch;h=b8e2fbdbfadf0e156ecd37d18b0719659a7c3907;hb=7a3d8fdd029a36ede122bc9fc1fb22be46cb5e90;hp=ec905758ba127c83e157e74bd98e654b1ce801cc;hpb=4b802a492846b0fbf101f55c9e8d72971d2d7a17;p=packages%2Fpython3.git

diff --git a/python3-multilib.patch b/python3-multilib.patch
index ec90575..b8e2fbd 100644
--- a/python3-multilib.patch
+++ b/python3-multilib.patch
@@ -58,7 +58,7 @@ diff -urNp -x '*.orig' Python-3.9.2.org/Lib/sysconfig.py Python-3.9.2/Lib/syscon
          '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}/{platlibdir}/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}',
@@ -72,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',
@@ -83,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',
@@ -141,10 +141,10 @@ 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.3/Lib/test/test_sysconfig.py~	2022-03-16 12:27:11.000000000 +0100
-+++ Python-3.10.3/Lib/test/test_sysconfig.py	2022-03-22 23:11:16.335919644 +0100
-@@ -299,13 +299,13 @@
-                 expected = global_path.replace(base, user, 1)
+--- 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':