diff options
Diffstat (limited to 'lang/python32/files/patch-Makefile.pre.in')
| -rw-r--r-- | lang/python32/files/patch-Makefile.pre.in | 74 |
1 files changed, 41 insertions, 33 deletions
diff --git a/lang/python32/files/patch-Makefile.pre.in b/lang/python32/files/patch-Makefile.pre.in index 60c15542e123..e6747e02c186 100644 --- a/lang/python32/files/patch-Makefile.pre.in +++ b/lang/python32/files/patch-Makefile.pre.in @@ -1,17 +1,25 @@ +# Description: INSTALL_SHARED sometimes is not properly handled in the env +# Submitted by: mva + # Description: Remove duplicate CFLAGS, CPPFLAGS, LDFLAGS by stripping CONFIGURE_* # Submitted by: koobs (r326729) # TODO: Upstream -# Description: Fix out-of-tree build as a result of upstream #15819 -# Submitted by: rm (r318353) -# Issue ID: http://bugs.python.org/issue15819#msg203348 - # Description: Run ranlib before installing the library read-only # Submitted by: antoine@ (r350207) # TODO: Upstream ---- ./Makefile.pre.in.orig 2013-05-16 02:33:51.000000000 +1000 -+++ ./Makefile.pre.in 2014-04-20 23:27:06.346079817 +1000 +--- Makefile.pre.in.orig 2013-05-15 18:33:51.000000000 +0200 ++++ Makefile.pre.in 2014-07-18 20:54:36.000000000 +0200 +@@ -60,7 +60,7 @@ + # Shared libraries must be installed with executable mode on some systems; + # rather than figuring out exactly which, we always give them executable mode. + # Also, making them read-only seems to be a good idea... +-INSTALL_SHARED= ${INSTALL} -m 555 ++INSTALL_SHARED?= ${INSTALL} -m 555 + + MKDIR_P= @MKDIR_P@ + @@ -70,18 +70,18 @@ OPT= @OPT@ BASECFLAGS= @BASECFLAGS@ @@ -37,32 +45,6 @@ NO_AS_NEEDED= @NO_AS_NEEDED@ LDLAST= @LDLAST@ SGI_ABI= @SGI_ABI@ -@@ -277,21 +277,21 @@ - - ########################################################################## - # AST --AST_H_DIR= Include -+AST_H_DIR= $(srcdir)/Include - AST_H= $(AST_H_DIR)/Python-ast.h --AST_C_DIR= Python -+AST_C_DIR= $(srcdir)/Python - AST_C= $(AST_C_DIR)/Python-ast.c - AST_ASDL= $(srcdir)/Parser/Python.asdl - - ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py - # XXX Note that a build now requires Python exist before the build starts --ASDLGEN= @ASDLGEN@ $(srcdir)/Parser/asdl_c.py -+ASDLGEN= @DISABLE_ASDLGEN@ $(srcdir)/Parser/asdl_c.py - - ########################################################################## - # Python - - OPCODETARGETS_H= \ -- Python/opcode_targets.h -+ $(srcdir)/Python/opcode_targets.h - - OPCODETARGETGEN= \ - $(srcdir)/Python/makeopcodetargets.py @@ -676,7 +676,7 @@ Objects/setobject.o: $(srcdir)/Objects/stringlib/eq.h @@ -81,7 +63,20 @@ ############################################################################ # Header files -@@ -1108,8 +1108,8 @@ +@@ -908,12 +908,6 @@ + else true; \ + fi + (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON)3$(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); \ +- fi + -rm -f $(DESTDIR)$(BINDIR)/python3-config + (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config) + -rm -f $(DESTDIR)$(LIBPC)/python3.pc +@@ -1108,8 +1102,8 @@ if test "$(SHLIB_SUFFIX)" = .dll; then \ $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ else \ @@ -91,3 +86,16 @@ fi; \ else \ echo Skip install of $(LIBRARY) - use make frameworkinstall; \ +@@ -1126,6 +1120,12 @@ + $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup + $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh + $(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); \ ++ fi + rm python-config + @if [ -s Modules/python.exp -a \ + "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ |