python-BLDLIBRARY.patch

   1 --- Python-2.7.18/Makefile.pre.in.orig  2020-09-08 22:20:51.653142275 +0200
   2 +++ Python-2.7.18/Makefile.pre.in       2020-09-09 06:25:42.385544260 +0200
   3 @@ -179,6 +179,7 @@
   4  LIBRARY=       @LIBRARY@
   5  LDLIBRARY=      @LDLIBRARY@
   6  BLDLIBRARY=     @BLDLIBRARY@
   7 +BLDLIBDIR=      @BLDLIBDIR@
   8  DLLLIBRARY=    @DLLLIBRARY@
   9  LDLIBRARYDIR=   @LDLIBRARYDIR@
  10  INSTSONAME=    @INSTSONAME@
  11 @@ -491,7 +492,7 @@
  12  $(BUILDPYTHON):        Modules/python.o $(LIBRARY) $(LDLIBRARY)
  13                 $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
  14                         Modules/python.o \
  15 -                       $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  16 +                       $(BLDLIBDIR) $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  17
  18  platform: $(BUILDPYTHON) pybuilddir.txt
  19         $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
  20 --- Python-2.7.18/configure.ac.orig     2020-09-08 22:20:51.639809014 +0200
  21 +++ Python-2.7.18/configure.ac  2020-09-09 06:28:34.254613165 +0200
  22 @@ -835,11 +835,13 @@
  23  # on the system - some systems like version suffix, others don't
  24  AC_SUBST(LDLIBRARY)
  25  AC_SUBST(DLLLIBRARY)
  26 +AC_SUBST(BLDLIBDIR)
  27  AC_SUBST(BLDLIBRARY)
  28  AC_SUBST(LDLIBRARYDIR)
  29  AC_SUBST(INSTSONAME)
  30  AC_SUBST(RUNSHARED)
  31  LDLIBRARY="$LIBRARY"
  32 +BLDLIBDIR=''
  33  BLDLIBRARY='$(LDLIBRARY)'
  34  INSTSONAME='$(LDLIBRARY)'
  35  DLLLIBRARY=''
  36 @@ -957,13 +959,15 @@
  37            ;;
  38      SunOS*)
  39           LDLIBRARY='libpython$(VERSION).so'
  40 -         BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
  41 +         BLDLIBDIR='-Wl,-R,$(LIBDIR) -L.'
  42 +         BLDLIBRARY='-lpython$(VERSION)'
  43           RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
  44           INSTSONAME="$LDLIBRARY".$SOVERSION
  45            ;;
  46      Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
  47           LDLIBRARY='libpython$(VERSION).so'
  48 -         BLDLIBRARY='-L. -lpython$(VERSION)'
  49 +         BLDLIBDIR='-L.'
  50 +         BLDLIBRARY='-lpython$(VERSION)'
  51           RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
  52           case $ac_sys_system in
  53               FreeBSD*)
  54 @@ -981,22 +985,26 @@
  55                         LDLIBRARY='libpython$(VERSION).sl'
  56                         ;;
  57           esac
  58 -         BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
  59 +         BLDLIBDIR='-Wl,+b,$(LIBDIR) -L.'
  60 +         BLDLIBRARY='-lpython$(VERSION)'
  61           RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
  62           ;;
  63      OSF*)
  64           LDLIBRARY='libpython$(VERSION).so'
  65 -         BLDLIBRARY='-rpath $(LIBDIR) -L. -lpython$(VERSION)'
  66 +         BLDLIBDIR='-rpath $(LIBDIR) -L.'
  67 +         BLDLIBRARY='-lpython$(VERSION)'
  68           RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
  69           ;;
  70      atheos*)
  71           LDLIBRARY='libpython$(VERSION).so'
  72 -         BLDLIBRARY='-L. -lpython$(VERSION)'
  73 +         BLDLIBDIR='-L.'
  74 +         BLDLIBRARY='-lpython$(VERSION)'
  75           RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
  76           ;;
  77      Darwin*)
  78         LDLIBRARY='libpython$(VERSION).dylib'
  79 -       BLDLIBRARY='-L. -lpython$(VERSION)'
  80 +       BLDLIBDIR='-L.'
  81 +       BLDLIBRARY='-lpython$(VERSION)'
  82         RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
  83         ;;
  84      AIX*)