65 lines
3.5 KiB
Text
65 lines
3.5 KiB
Text
# Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_*
|
|
# Submitted by: koobs (r326729)
|
|
# TODO: Upstream
|
|
--- Makefile.pre.in.orig 2022-11-02 01:30:49 UTC
|
|
+++ Makefile.pre.in
|
|
@@ -82,7 +82,6 @@ BASECPPFLAGS= @BASECPPFLAGS@
|
|
OPT= @OPT@
|
|
BASECFLAGS= @BASECFLAGS@
|
|
BASECPPFLAGS= @BASECPPFLAGS@
|
|
-CONFIGURE_CFLAGS= @CFLAGS@
|
|
# 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
|
|
# once Python is installed (Issue #21121).
|
|
@@ -94,18 +93,16 @@ CONFIGURE_LDFLAGS_NOLTO=@LDFLAGS_NOLTO@
|
|
# LDFLAGS_NOLTO is an extra flag to disable lto. It is used to speed up building
|
|
# of _bootstrap_python and _freeze_module tools, which don't need LTO.
|
|
CONFIGURE_LDFLAGS_NOLTO=@LDFLAGS_NOLTO@
|
|
-CONFIGURE_CPPFLAGS= @CPPFLAGS@
|
|
-CONFIGURE_LDFLAGS= @LDFLAGS@
|
|
# Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
|
|
# command line to append to these values without stomping the pre-set
|
|
# values.
|
|
-PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
|
|
+PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CFLAGS) $(EXTRA_CFLAGS)
|
|
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
|
|
# be able to build extension modules using the directories specified in the
|
|
# environment variables
|
|
-PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
|
|
-PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS)
|
|
+PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CPPFLAGS)
|
|
+PY_LDFLAGS= $(LDFLAGS)
|
|
PY_LDFLAGS_NODIST=$(CONFIGURE_LDFLAGS_NODIST) $(LDFLAGS_NODIST)
|
|
PY_LDFLAGS_NOLTO=$(PY_LDFLAGS) $(CONFIGURE_LDFLAGS_NOLTO) $(LDFLAGS_NODIST)
|
|
NO_AS_NEEDED= @NO_AS_NEEDED@
|
|
@@ -1880,14 +1877,6 @@ bininstall: altbininstall
|
|
else true; \
|
|
fi
|
|
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE))
|
|
- -if test "$(VERSION)" != "$(LDVERSION)"; then \
|
|
- rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
|
|
- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
|
|
- rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
|
|
- (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \
|
|
- rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION)-embed.pc; \
|
|
- (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python-$(LDVERSION)-embed.pc); \
|
|
- fi
|
|
-rm -f $(DESTDIR)$(BINDIR)/python3-config
|
|
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config)
|
|
-rm -f $(DESTDIR)$(LIBPC)/python3.pc
|
|
@@ -2267,6 +2256,14 @@ libainstall: all scripts
|
|
$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
|
|
$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
|
|
$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config
|
|
+ -if test "$(VERSION)" != "$(LDVERSION)"; then \
|
|
+ rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
|
|
+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
|
|
+ rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
|
|
+ (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \
|
|
+ rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION)-embed.pc; \
|
|
+ (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python-$(LDVERSION)-embed.pc); \
|
|
+ fi
|
|
$(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION)
|
|
$(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION)
|
|
$(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION)
|