summaryrefslogtreecommitdiff
path: root/package/python2/patches/patch-Makefile_pre_in
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-04-11 23:39:38 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2015-04-11 23:39:38 +0200
commitc1b759f6a4dca2f8c708f0ceae4a88d0da8ca0de (patch)
treefa1513166c7d8d43650308d48aaa0f8594e91043 /package/python2/patches/patch-Makefile_pre_in
parent022e705d87a6bc130dde6d5681656ab559f492ce (diff)
update to latest stable upstream
Diffstat (limited to 'package/python2/patches/patch-Makefile_pre_in')
-rw-r--r--package/python2/patches/patch-Makefile_pre_in14
1 files changed, 7 insertions, 7 deletions
diff --git a/package/python2/patches/patch-Makefile_pre_in b/package/python2/patches/patch-Makefile_pre_in
index 26077c7fc..b68b57028 100644
--- a/package/python2/patches/patch-Makefile_pre_in
+++ b/package/python2/patches/patch-Makefile_pre_in
@@ -1,6 +1,6 @@
---- Python-2.7.5.orig/Makefile.pre.in 2013-05-12 05:32:49.000000000 +0200
-+++ Python-2.7.5/Makefile.pre.in 2013-11-01 14:54:24.000000000 +0100
-@@ -227,6 +227,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
+--- Python-2.7.9.orig/Makefile.pre.in 2014-12-10 16:59:50.000000000 +0100
++++ Python-2.7.9/Makefile.pre.in 2015-04-11 14:06:58.373384200 +0200
+@@ -234,6 +234,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
##########################################################################
# Parser
PGEN= Parser/pgen$(EXE)
@@ -8,16 +8,16 @@
PSRCS= \
Parser/acceler.c \
-@@ -456,7 +457,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
- *) quiet="";; \
+@@ -474,7 +475,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py build
# Build static library
# avoid long command lines, same as LIBRARY_OBJS
-@@ -593,7 +594,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/p
+@@ -611,7 +612,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/p
$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
@$(MKDIR_P) Include
$(MAKE) $(PGEN)
@@ -26,7 +26,7 @@
$(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
$(MAKE) $(GRAMMAR_H)
touch $(GRAMMAR_C)
-@@ -1000,28 +1001,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL
+@@ -1042,28 +1043,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi