[packages/python3] - added BLDLIBRARY patch (drop "-L." from BLDLIBRARY config variable) - unify multilib with python2:

[qboosh]

commit 49e8feb60e335b8c23f3b0e6ec9d2bf1a40618aa
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Sep 17 16:11:57 2020 +0200

    - added BLDLIBRARY patch (drop "-L." from BLDLIBRARY config variable)
    - unify multilib with python2: Do not use $prefix/share in default install scheme (it broke virtualenv)
    - release 3

 python3-BLDLIBRARY.patch | 83 ++++++++++++++++++++++++++++++++++++++++++++++++
 python3-multilib.patch   |  4 +--
 python3.spec             |  6 ++--
 3 files changed, 88 insertions(+), 5 deletions(-)
---
diff --git a/python3.spec b/python3.spec
index 7dc90c4..7171b8e 100644
--- a/python3.spec
+++ b/python3.spec
@@ -42,7 +42,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}.5
-Release:	2
+Release:	3
 Epoch:		1
 License:	PSF
 Group:		Development/Languages/Python
@@ -55,7 +55,7 @@ Patch2:		%{name}-multilib.patch
 Patch3:		%{name}-no_cmdline_tests.patch
 Patch4:		%{name}-makefile-location.patch
 Patch5:		%{name}-config.patch
-
+Patch6:		%{name}-BLDLIBRARY.patch
 Patch7:		%{name}-db.patch
 Patch8:		%{name}-install_prefix.patch
 Patch9:		%{name}-tests_with_pythonpath.patch
@@ -492,7 +492,7 @@ Moduły testowe dla Pythona.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-
+%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
diff --git a/python3-BLDLIBRARY.patch b/python3-BLDLIBRARY.patch
new file mode 100644
index 0000000..1d7dd06
--- /dev/null
+++ b/python3-BLDLIBRARY.patch
@@ -0,0 +1,83 @@
+--- Python-3.8.5/Makefile.pre.in.orig	2020-09-17 07:55:13.731893519 +0200
++++ Python-3.8.5/Makefile.pre.in	2020-09-17 10:33:36.683744945 +0200
+@@ -224,6 +224,7 @@
+ LIBRARY=	@LIBRARY@
+ LDLIBRARY=      @LDLIBRARY@
+ BLDLIBRARY=     @BLDLIBRARY@
++BLDLIBDIR=      @BLDLIBDIR@
+ PY3LIBRARY=     @PY3LIBRARY@
+ DLLLIBRARY=	@DLLLIBRARY@
+ LDLIBRARYDIR=   @LDLIBRARYDIR@
+@@ -565,7 +566,7 @@
+ 
+ # Build the interpreter
+ $(BUILDPYTHON):	Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
+-	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
++	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBDIR) $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
+ 
+ platform: $(BUILDPYTHON) pybuilddir.txt
+ 	$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform
+@@ -696,7 +697,7 @@
+ 
+ 
+ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
+-	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
++	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBDIR) $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
+ 
+ ############################################################################
+ # Importlib
+--- Python-3.8.5/configure.ac.orig	2020-09-17 07:55:13.735226834 +0200
++++ Python-3.8.5/configure.ac	2020-09-17 10:46:44.172812084 +0200
+@@ -1033,6 +1033,7 @@
+ # with the ABI build flags appended.
+ AC_SUBST(LDLIBRARY)
+ AC_SUBST(DLLLIBRARY)
++AC_SUBST(BLDLIBDIR)
+ AC_SUBST(BLDLIBRARY)
+ AC_SUBST(PY3LIBRARY)
+ AC_SUBST(LDLIBRARYDIR)
+@@ -1040,6 +1041,7 @@
+ AC_SUBST(RUNSHARED)
+ AC_SUBST(LDVERSION)
+ LDLIBRARY="$LIBRARY"
++BLDLIBDIR=''
+ BLDLIBRARY='$(LDLIBRARY)'
+ INSTSONAME='$(LDLIBRARY)'
+ DLLLIBRARY=''
+@@ -1156,7 +1158,8 @@
+           ;;
+     SunOS*)
+ 	  LDLIBRARY='libpython$(LDVERSION).so'
+-	  BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)'
++	  BLDLIBDIR='-Wl,-R,$(LIBDIR) -L.'
++	  BLDLIBRARY='-lpython$(VERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+ 	  if test "$with_pydebug" != yes
+@@ -1166,7 +1169,8 @@
+           ;;
+     Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
+ 	  LDLIBRARY='libpython$(LDVERSION).so'
+-	  BLDLIBRARY='-L. -lpython$(LDVERSION)'
++	  BLDLIBDIR='-L.'
++	  BLDLIBRARY='-lpython$(VERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+ 	  if test "$with_pydebug" != yes
+@@ -1183,12 +1187,14 @@
+ 			LDLIBRARY='libpython$(LDVERSION).sl'
+ 			;;
+ 	  esac
+-	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)'
++	  BLDLIBDIR='-Wl,+b,$(LIBDIR) -L.'
++	  BLDLIBRARY='-lpython$(VERSION)'
+ 	  RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
+ 	  ;;
+     Darwin*)
+     	LDLIBRARY='libpython$(LDVERSION).dylib'
+-	BLDLIBRARY='-L. -lpython$(LDVERSION)'
++	BLDLIBDIR='-L.'
++	BLDLIBRARY='-lpython$(LDVERSION)'
+ 	RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
+ 	;;
+     AIX*)
diff --git a/python3-multilib.patch b/python3-multilib.patch
index 96fafe6..d54c591 100644
--- a/python3-multilib.patch
+++ b/python3-multilib.patch
@@ -49,10 +49,10 @@ diff -dur Python-3.5.0.orig/Lib/distutils/sysconfig.py Python-3.5.0/Lib/distutil
              prefix = plat_specific and EXEC_PREFIX or PREFIX
  
      if os.name == "posix":
-+        if plat_specific:
++        if plat_specific or standard_lib or prefix != "/usr":
 +            lib = sys.lib
 +        else:
-+            lib = 'share'
++            lib = "share"
          libpython = os.path.join(prefix,
 -                                 "lib", "python" + get_python_version())
 +                                 lib, "python" + get_python_version())
================================================================

---- gitweb:

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