[packages/python3] - enhanced multilib patch to adjust venv lib symlinking; release 2

qboosh qboosh at pld-linux.org
Sat Sep 23 13:40:29 CEST 2023


commit a5326af3a474c02de96c9c0d84ffbc0b512b4989
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 23 12:47:27 2023 +0200

    - enhanced multilib patch to adjust venv lib symlinking; release 2

 python3-multilib.patch | 16 ++++++++++++++++
 python3.spec           |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/python3.spec b/python3.spec
index 53c476c..cc4b1f4 100644
--- a/python3.spec
+++ b/python3.spec
@@ -48,7 +48,7 @@ Summary(tr.UTF-8):	X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili
 Summary(uk.UTF-8):	Мова програмування дуже високого рівня з X-інтерфейсом
 Name:		python3
 Version:	%{py_ver}.13
-Release:	1
+Release:	2
 Epoch:		1
 License:	PSF
 Group:		Development/Languages/Python
diff --git a/python3-multilib.patch b/python3-multilib.patch
index b8e2fbd..83174c6 100644
--- a/python3-multilib.patch
+++ b/python3-multilib.patch
@@ -160,3 +160,19 @@ diff -urNp -x '*.orig' Python-3.9.2.org/setup.py Python-3.9.2/setup.py
                  self.assertEqual(user_path, expected)
  
      def test_main(self):
+--- Python-3.10.13/Lib/venv/__init__.py.orig	2023-08-24 14:46:25.000000000 +0200
++++ Python-3.10.13/Lib/venv/__init__.py	2023-09-23 12:30:09.948046280 +0200
+@@ -137,10 +137,9 @@ class EnvBuilder:
+         context.inc_path = path = os.path.join(env_dir, incpath)
+         create_if_needed(path)
+         create_if_needed(libpath)
+-        # Issue 21197: create lib64 as a symlink to lib on 64-bit non-OS X POSIX
+-        if ((sys.maxsize > 2**32) and (os.name == 'posix') and
+-            (sys.platform != 'darwin')):
+-            link_path = os.path.join(env_dir, 'lib64')
++        # Issue 21197: create lib<qual> as a symlink to lib on 64-bit non-OS X POSIX
++        if sys.platlibdir != 'lib':
++            link_path = os.path.join(env_dir, sys.platlibdir)
+             if not os.path.exists(link_path):   # Issue #21643
+                 os.symlink('lib', link_path)
+         context.bin_path = binpath = os.path.join(env_dir, binname)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python3.git/commitdiff/a5326af3a474c02de96c9c0d84ffbc0b512b4989



More information about the pld-cvs-commit mailing list