Changeset View
Changeset View
Standalone View
Standalone View
lang/python38/files/patch-Makefile.pre.in
| # Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_* | # Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_* | ||||
| # Submitted by: koobs (r326729) | # Submitted by: koobs (r326729) | ||||
| # TODO: Upstream | # TODO: Upstream | ||||
| # Description: Create symlinks for non-ABI-suffixed python*-config and ABI-suffixed python-*.pc | # Description: Create symlinks for non-ABI-suffixed python*-config and ABI-suffixed python-*.pc | ||||
| # Submitted by: antoine@ (r358029) | # Submitted by: antoine@ (r358029) | ||||
| # TODO: Upstream | # TODO: Upstream | ||||
| --- Makefile.pre.in.orig 2018-12-25 13:00:52 UTC | --- Makefile.pre.in.orig 2019-03-25 19:36:40 UTC | ||||
| +++ Makefile.pre.in | +++ Makefile.pre.in | ||||
| @@ -80,7 +80,6 @@ MAKESETUP= $(srcdir)/Modules/makesetup | @@ -79,7 +79,6 @@ MAKESETUP= $(srcdir)/Modules/makesetup | ||||
| OPT= @OPT@ | OPT= @OPT@ | ||||
| BASECFLAGS= @BASECFLAGS@ | BASECFLAGS= @BASECFLAGS@ | ||||
| BASECPPFLAGS= @BASECPPFLAGS@ | BASECPPFLAGS= @BASECPPFLAGS@ | ||||
| -CONFIGURE_CFLAGS= @CFLAGS@ | -CONFIGURE_CFLAGS= @CFLAGS@ | ||||
| # CFLAGS_NODIST is used for building the interpreter and stdlib C extensions. | # CFLAGS_NODIST is used for building the interpreter and stdlib C extensions. | ||||
| # Use it when a compiler flag should _not_ be part of the distutils CFLAGS | # Use it when a compiler flag should _not_ be part of the distutils CFLAGS | ||||
| # once Python is installed (Issue #21121). | # once Python is installed (Issue #21121). | ||||
| @@ -89,18 +88,16 @@ CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@ | @@ -88,18 +87,16 @@ CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@ | ||||
| # Use it when a linker flag should _not_ be part of the distutils LDFLAGS | # Use it when a linker flag should _not_ be part of the distutils LDFLAGS | ||||
| # once Python is installed (bpo-35257) | # once Python is installed (bpo-35257) | ||||
| CONFIGURE_LDFLAGS_NODIST=@LDFLAGS_NODIST@ | CONFIGURE_LDFLAGS_NODIST=@LDFLAGS_NODIST@ | ||||
| -CONFIGURE_CPPFLAGS= @CPPFLAGS@ | -CONFIGURE_CPPFLAGS= @CPPFLAGS@ | ||||
| -CONFIGURE_LDFLAGS= @LDFLAGS@ | -CONFIGURE_LDFLAGS= @LDFLAGS@ | ||||
| # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the | # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the | ||||
| # command line to append to these values without stomping the pre-set | # command line to append to these values without stomping the pre-set | ||||
| # values. | # values. | ||||
| -PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) | -PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) | ||||
| +PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CFLAGS) $(EXTRA_CFLAGS) | +PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CFLAGS) $(EXTRA_CFLAGS) | ||||
| PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST) | PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST) -I$(srcdir)/Include/internal | ||||
| # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to | # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to | ||||
| # be able to build extension modules using the directories specified in the | # be able to build extension modules using the directories specified in the | ||||
| # environment variables | # environment variables | ||||
| -PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) | -PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) | ||||
| -PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS) | -PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS) | ||||
| +PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CPPFLAGS) | +PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CPPFLAGS) | ||||
| +PY_LDFLAGS= $(LDFLAGS) | +PY_LDFLAGS= $(LDFLAGS) | ||||
| PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST) | PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST) | ||||
| NO_AS_NEEDED= @NO_AS_NEEDED@ | NO_AS_NEEDED= @NO_AS_NEEDED@ | ||||
| LDLAST= @LDLAST@ | SGI_ABI= @SGI_ABI@ | ||||
| @@ -1213,12 +1210,6 @@ bininstall: altbininstall | @@ -1239,12 +1236,6 @@ bininstall: altbininstall | ||||
| else true; \ | else true; \ | ||||
| fi | fi | ||||
| (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE)) | (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE)) | ||||
| - -if test "$(VERSION)" != "$(LDVERSION)"; then \ | - -if test "$(VERSION)" != "$(LDVERSION)"; then \ | ||||
| - rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ | - rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ | ||||
| - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ | - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ | ||||
| - rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ | - rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ | ||||
| - (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ | - (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ | ||||
| - fi | - fi | ||||
| -rm -f $(DESTDIR)$(BINDIR)/python3-config | -rm -f $(DESTDIR)$(BINDIR)/python3-config | ||||
| (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config) | (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config) | ||||
| -rm -f $(DESTDIR)$(LIBPC)/python3.pc | -rm -f $(DESTDIR)$(LIBPC)/python3.pc | ||||
| @@ -1505,6 +1496,12 @@ libainstall: @DEF_MAKE_RULE@ python-config | @@ -1539,6 +1530,12 @@ libainstall: @DEF_MAKE_RULE@ python-config | ||||
| $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh | $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh | ||||
| $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py | $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py | ||||
| $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config | $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config | ||||
| + -if test "$(VERSION)" != "$(LDVERSION)"; then \ | + -if test "$(VERSION)" != "$(LDVERSION)"; then \ | ||||
| + rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ | + rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \ | ||||
| + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ | + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \ | ||||
| + rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ | + rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \ | ||||
| + (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ | + (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \ | ||||
| + fi | + fi | ||||
| @if [ -s Modules/python.exp -a \ | @if [ -s Modules/python.exp -a \ | ||||
| "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ | "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ | ||||
| echo; echo "Installing support files for building shared extension modules on AIX:"; \ | echo; echo "Installing support files for building shared extension modules on AIX:"; \ | ||||