python3-BLDLIBRARY.patch

   1 --- Python-3.8.5/Makefile.pre.in.orig   2020-09-17 07:55:13.731893519 +0200
   2 +++ Python-3.8.5/Makefile.pre.in        2020-09-17 10:33:36.683744945 +0200
   3 @@ -224,6 +224,7 @@
   4  LIBRARY=       @LIBRARY@
   5  LDLIBRARY=      @LDLIBRARY@
   6  BLDLIBRARY=     @BLDLIBRARY@
   7 +BLDLIBDIR=      @BLDLIBDIR@
   8  PY3LIBRARY=     @PY3LIBRARY@
   9  DLLLIBRARY=    @DLLLIBRARY@
  10  LDLIBRARYDIR=   @LDLIBRARYDIR@
  11 @@ -780,7 +780,7 @@ clinic: check-clean-src $(srcdir)/Module
  12
  13  # Build the interpreter
  14  $(BUILDPYTHON):        Programs/python.o $(LINK_PYTHON_DEPS)
  15 -       $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(LINK_PYTHON_OBJS) $(LIBS) $(MODLIBS) $(SYSLIBS)
  16 +       $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBDIR) $(LINK_PYTHON_OBJS) $(LIBS) $(MODLIBS) $(SYSLIBS)
  17
  18  platform: $(PYTHON_FOR_BUILD_DEPS) pybuilddir.txt
  19         $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform
  20 @@ -1056,7 +1056,7 @@ regen-re: $(BUILDPYTHON)
  21         $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/build/generate_re_casefix.py $(srcdir)/Lib/re/_casefix.py
  22
  23  Programs/_testembed: Programs/_testembed.o $(LINK_PYTHON_DEPS)
  24 -       $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(LINK_PYTHON_OBJS) $(LIBS) $(MODLIBS) $(SYSLIBS)
  25 +       $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBDIR) $(LINK_PYTHON_OBJS) $(LIBS) $(MODLIBS) $(SYSLIBS)
  26
  27  ############################################################################
  28  # "Bootstrap Python" used to run deepfreeze.py
  29 --- Python-3.8.5/configure.ac.orig      2020-09-17 07:55:13.735226834 +0200
  30 +++ Python-3.8.5/configure.ac   2020-09-17 10:46:44.172812084 +0200
  31 @@ -1359,6 +1359,7 @@ AC_MSG_RESULT([$LIBRARY])
  32  # with the ABI build flags appended.
  33  AC_SUBST([LDLIBRARY])
  34  AC_SUBST([DLLLIBRARY])
  35 +AC_SUBST([BLDLIBDIR])
  36  AC_SUBST([BLDLIBRARY])
  37  AC_SUBST([PY3LIBRARY])
  38  AC_SUBST([LDLIBRARYDIR])
  39 @@ -1366,6 +1367,7 @@ AC_SUBST([INSTSONAME])
  40  AC_SUBST([RUNSHARED])
  41  AC_SUBST([LDVERSION])
  42  LDLIBRARY="$LIBRARY"
  43 +BLDLIBDIR=''
  44  BLDLIBRARY='$(LDLIBRARY)'
  45  INSTSONAME='$(LDLIBRARY)'
  46  DLLLIBRARY=''
  47 @@ -1156,7 +1158,8 @@
  48            ;;
  49      SunOS*)
  50           LDLIBRARY='libpython$(LDVERSION).so'
  51 -         BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)'
  52 +         BLDLIBDIR='-Wl,-R,$(LIBDIR) -L.'
  53 +         BLDLIBRARY='-lpython$(VERSION)'
  54           RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
  55           INSTSONAME="$LDLIBRARY".$SOVERSION
  56           if test "$with_pydebug" != yes
  57 @@ -1147,7 +1147,8 @@ if test $enable_shared = "yes"; then
  58            ;;
  59      Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|VxWorks*)
  60           LDLIBRARY='libpython$(LDVERSION).so'
  61 -         BLDLIBRARY='-L. -lpython$(LDVERSION)'
  62 +         BLDLIBDIR='-L.'
  63 +         BLDLIBRARY='-lpython$(VERSION)'
  64           RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
  65           INSTSONAME="$LDLIBRARY".$SOVERSION
  66           if test "$with_pydebug" != yes
  67 @@ -1183,12 +1187,14 @@
  68                         LDLIBRARY='libpython$(LDVERSION).sl'
  69                         ;;
  70           esac
  71 -         BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)'
  72 +         BLDLIBDIR='-Wl,+b,$(LIBDIR) -L.'
  73 +         BLDLIBRARY='-lpython$(VERSION)'
  74           RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
  75           ;;
  76      Darwin*)
  77         LDLIBRARY='libpython$(LDVERSION).dylib'
  78 -       BLDLIBRARY='-L. -lpython$(LDVERSION)'
  79 +       BLDLIBDIR='-L.'
  80 +       BLDLIBRARY='-lpython$(LDVERSION)'
  81         RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
  82         ;;
  83      AIX*)