python-ac_fixes.patch

   1 diff -urNp -x '*.orig' Python-2.7.18.org/Makefile.pre.in Python-2.7.18/Makefile.pre.in
   2 --- Python-2.7.18.org/Makefile.pre.in   2020-04-19 23:13:39.000000000 +0200
   3 +++ Python-2.7.18/Makefile.pre.in       2021-09-26 12:34:28.007790961 +0200
   4 @@ -1030,14 +1030,12 @@ altmaninstall:
   5                 fi; \
   6         done
   7         $(INSTALL_DATA) $(srcdir)/Misc/python.man \
   8 -               $(DESTDIR)$(MANDIR)/man1/python$(VERSION).1
   9 +               $(DESTDIR)$(MANDIR)/man1/python.1
  10
  11  # Install the unversioned manual pages
  12  maninstall:    altmaninstall
  13         -rm -f $(DESTDIR)$(MANDIR)/man1/python2.1
  14 -       (cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python$(VERSION).1 python2.1)
  15 -       -rm -f $(DESTDIR)$(MANDIR)/man1/python.1
  16 -       (cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python2.1 python.1)
  17 +       (cd $(DESTDIR)$(MANDIR)/man1; $(LN) -s python.1 python2.1)
  18
  19  # Install the library
  20  PLATDIR=       @PLATDIR@
  21 @@ -1180,7 +1178,7 @@ $(srcdir)/Lib/$(PLATDIR):
  22  python-config: $(srcdir)/Misc/python-config.in
  23         # Substitution happens here, as the completely-expanded BINDIR
  24         # is not available in configure
  25 -       sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
  26 +       sed -e "s,@EXENAME@,$(BINDIR)/python$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
  27
  28  # Install the include files
  29  INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
  30 diff -urNp -x '*.orig' Python-2.7.18.org/configure.ac Python-2.7.18/configure.ac
  31 --- Python-2.7.18.org/configure.ac      2020-04-19 23:13:39.000000000 +0200
  32 +++ Python-2.7.18/configure.ac  2021-09-26 12:34:28.007790961 +0200
  33 @@ -1090,13 +1090,13 @@ then
  34             if test "$Py_DEBUG" = 'true' ; then
  35                 # Optimization messes up debuggers, so turn it off for
  36                 # debug builds.
  37 -               OPT="-g -O0 -Wall $STRICT_PROTO"
  38 +               OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
  39             else
  40 -               OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
  41 +               OPT="-g $WRAP $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
  42             fi
  43             ;;
  44         *)
  45 -           OPT="-O3 -Wall $STRICT_PROTO"
  46 +           OPT="$CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
  47             ;;
  48         esac
  49         case $ac_sys_system in