From 05607efb1e46216085afa9884ec8545502d4558c Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Wed, 9 Sep 2020 21:20:57 +0200
Subject: [PATCH] - added BLDLIBRARY path (drop "-L." from BLDLIBRARY config
 variable); release 4

---
 python-BLDLIBRARY.patch | 84 +++++++++++++++++++++++++++++++++++++++++
 python.spec             |  6 ++-
 2 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 python-BLDLIBRARY.patch

diff --git a/python-BLDLIBRARY.patch b/python-BLDLIBRARY.patch
new file mode 100644
index 0000000..e5ebdd2
--- /dev/null
+++ b/python-BLDLIBRARY.patch
@@ -0,0 +1,84 @@
+--- Python-2.7.18/Makefile.pre.in.orig	2020-09-08 22:20:51.653142275 +0200
++++ Python-2.7.18/Makefile.pre.in	2020-09-09 06:25:42.385544260 +0200
+@@ -179,6 +179,7 @@
+ LIBRARY=	@LIBRARY@
+ LDLIBRARY=      @LDLIBRARY@
+ BLDLIBRARY=     @BLDLIBRARY@
++BLDLIBDIR=      @BLDLIBDIR@
+ DLLLIBRARY=	@DLLLIBRARY@
+ LDLIBRARYDIR=   @LDLIBRARYDIR@
+ INSTSONAME=	@INSTSONAME@
+@@ -491,7 +492,7 @@
+ $(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY)
+ 		$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
+ 			Modules/python.o \
+-			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
++			$(BLDLIBDIR) $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+ platform: $(BUILDPYTHON) pybuilddir.txt
+ 	$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
+--- Python-2.7.18/configure.ac.orig	2020-09-08 22:20:51.639809014 +0200
++++ Python-2.7.18/configure.ac	2020-09-09 06:28:34.254613165 +0200
+@@ -835,11 +835,13 @@
+ # on the system - some systems like version suffix, others don't
+ AC_SUBST(LDLIBRARY)
+ AC_SUBST(DLLLIBRARY)
++AC_SUBST(BLDLIBDIR)
+ AC_SUBST(BLDLIBRARY)
+ AC_SUBST(LDLIBRARYDIR)
+ AC_SUBST(INSTSONAME)
+ AC_SUBST(RUNSHARED)
+ LDLIBRARY="$LIBRARY"
++BLDLIBDIR=''
+ BLDLIBRARY='$(LDLIBRARY)'
+ INSTSONAME='$(LDLIBRARY)'
+ DLLLIBRARY=''
+@@ -957,13 +959,15 @@
+           ;;
+     SunOS*)
+ 	  LDLIBRARY='libpython$(VERSION).so'
+-	  BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
++	  BLDLIBDIR='-Wl,-R,$(LIBDIR) -L.'
++	  BLDLIBRARY='-lpython$(VERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+           ;;
+     Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
+ 	  LDLIBRARY='libpython$(VERSION).so'
+-	  BLDLIBRARY='-L. -lpython$(VERSION)'
++	  BLDLIBDIR='-L.'
++	  BLDLIBRARY='-lpython$(VERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+ 	  case $ac_sys_system in
+ 	      FreeBSD*)
+@@ -981,22 +985,26 @@
+ 			LDLIBRARY='libpython$(VERSION).sl'
+ 			;;
+ 	  esac
+-	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
++	  BLDLIBDIR='-Wl,+b,$(LIBDIR) -L.'
++	  BLDLIBRARY='-lpython$(VERSION)'
+ 	  RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
+ 	  ;;
+     OSF*)
+ 	  LDLIBRARY='libpython$(VERSION).so'
+-	  BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)'
++	  BLDLIBDIR='-rpath $(LIBDIR) -L.'
++	  BLDLIBRARY='-lpython$(VERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+ 	  ;;
+     atheos*)
+ 	  LDLIBRARY='libpython$(VERSION).so'
+-	  BLDLIBRARY='-L. -lpython$(VERSION)'
++	  BLDLIBDIR='-L.'
++	  BLDLIBRARY='-lpython$(VERSION)'
+ 	  RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
+ 	  ;;
+     Darwin*)
+     	LDLIBRARY='libpython$(VERSION).dylib'
+-	BLDLIBRARY='-L. -lpython$(VERSION)'
++	BLDLIBDIR='-L.'
++	BLDLIBRARY='-lpython$(VERSION)'
+ 	RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
+ 	;;
+     AIX*)
diff --git a/python.spec b/python.spec
index 86be752..8997ce4 100644
--- a/python.spec
+++ b/python.spec
@@ -39,7 +39,7 @@ Summary(tr.UTF-8):	X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili
 Summary(uk.UTF-8):	Мова програмування дуже високого рівня з X-інтерфейсом
 Name:		python
 Version:	%{py_ver}.18
-Release:	3
+Release:	4
 Epoch:		1
 License:	PSF
 Group:		Development/Languages/Python
@@ -59,6 +59,7 @@ Patch7:		%{name}-install_prefix.patch
 Patch8:		%{name}-bdist_rpm.patch
 # https://bugs.python.org/issue10496
 Patch9:		https://bugs.python.org/file21896/nonexistent_user.patch
+Patch10:	%{name}-BLDLIBRARY.patch
 # Patch9-md5:	db706fbe6de467c6e4c97c675eddf29a
 URL:		https://www.python.org/
 BuildRequires:	autoconf >= 2.65
@@ -586,6 +587,7 @@ napisanego w Pythonie.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 tar xjf %{SOURCE1}
 
@@ -669,7 +671,7 @@ cp -p Doc/info/python*info* $RPM_BUILD_ROOT%{_infodir}
 
 cp -p Makefile.pre.in $RPM_BUILD_ROOT%{py_libdir}/config
 
-mv $RPM_BUILD_ROOT{%{py_libdir}/config,%{_libdir}}/libpython%{py_ver}.a
+%{__mv} $RPM_BUILD_ROOT{%{py_libdir}/config,%{_libdir}}/libpython%{py_ver}.a
 ln -sf libpython%{py_ver}.a $RPM_BUILD_ROOT%{_libdir}/libpython.a
 ln -sf libpython%{py_ver}.so.1.0 $RPM_BUILD_ROOT%{_libdir}/libpython.so
 ln -sf libpython%{py_ver}.so.1.0 $RPM_BUILD_ROOT%{_libdir}/libpython%{py_ver}.so
-- 
2.44.0