|
@@ -1,6 +1,6 @@
|
|
|
diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in
|
|
|
--- Python-2.7.1.orig/Makefile.pre.in 2010-10-14 13:37:30.000000000 +0200
|
|
|
-+++ Python-2.7.1/Makefile.pre.in 2011-01-20 22:13:22.464906869 +0100
|
|
|
++++ Python-2.7.1/Makefile.pre.in 2011-10-15 16:09:58.000000000 +0200
|
|
|
@@ -59,7 +59,7 @@ MAKESETUP= $(srcdir)/Modules/makese
|
|
|
# Compiler options
|
|
|
OPT= @OPT@
|
|
@@ -35,7 +35,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in
|
|
|
|
|
|
build_all_use_profile:
|
|
|
$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use"
|
|
|
-@@ -398,14 +400,14 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA
|
|
|
+@@ -398,14 +400,13 @@ $(BUILDPYTHON): Modules/python.o $(LIBRA
|
|
|
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
|
|
|
|
|
platform: $(BUILDPYTHON)
|
|
@@ -48,12 +48,11 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in
|
|
|
@case $$MAKEFLAGS in \
|
|
|
- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
|
|
|
- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
|
|
|
-+ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \
|
|
|
+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \
|
|
|
esac
|
|
|
|
|
|
# Build static library
|
|
|
-@@ -538,7 +540,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
|
|
|
+@@ -538,7 +539,7 @@ Modules/python.o: $(srcdir)/Modules/pyth
|
|
|
|
|
|
$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
|
|
|
-@$(INSTALL) -d Include
|
|
@@ -62,7 +61,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in
|
|
|
|
|
|
$(PGEN): $(PGENOBJS)
|
|
|
$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
|
|
|
-@@ -702,7 +704,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho
|
|
|
+@@ -702,7 +703,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho
|
|
|
|
|
|
TESTOPTS= -l $(EXTRATESTOPTS)
|
|
|
TESTPROG= $(srcdir)/Lib/test/regrtest.py
|
|
@@ -71,7 +70,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in
|
|
|
test: all platform
|
|
|
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
|
|
|
-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
|
|
|
-@@ -725,7 +727,7 @@ testuniversal: all platform
|
|
|
+@@ -725,7 +726,7 @@ testuniversal: all platform
|
|
|
-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
|
|
|
-$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
|
|
|
$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
|
|
@@ -80,7 +79,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in
|
|
|
|
|
|
|
|
|
# Like testall, but with a single pass only
|
|
|
-@@ -920,26 +922,26 @@ libinstall: build_all $(srcdir)/Lib/$(PL
|
|
|
+@@ -920,26 +921,26 @@ libinstall: build_all $(srcdir)/Lib/$(PL
|
|
|
done; \
|
|
|
done
|
|
|
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
|
|
@@ -114,7 +113,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in
|
|
|
|
|
|
# Create the PLATDIR source directory, if one wasn't distributed..
|
|
|
$(srcdir)/Lib/$(PLATDIR):
|
|
|
-@@ -1044,7 +1046,8 @@ libainstall: all python-config
|
|
|
+@@ -1044,7 +1045,8 @@ libainstall: all python-config
|
|
|
# Install the dynamically loadable modules
|
|
|
# This goes into $(exec_prefix)
|
|
|
sharedinstall: sharedmods
|
|
@@ -124,7 +123,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in
|
|
|
--prefix=$(prefix) \
|
|
|
--install-scripts=$(BINDIR) \
|
|
|
--install-platlib=$(DESTSHARED) \
|
|
|
-@@ -1082,7 +1085,7 @@ frameworkinstallstructure: $(LDLIBRARY)
|
|
|
+@@ -1082,7 +1084,7 @@ frameworkinstallstructure: $(LDLIBRARY)
|
|
|
fi; \
|
|
|
done
|
|
|
$(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers
|
|
@@ -133,7 +132,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in
|
|
|
$(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
|
|
|
$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
|
|
|
$(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
|
|
|
-@@ -1117,7 +1120,7 @@ frameworkinstallextras:
|
|
|
+@@ -1117,7 +1119,7 @@ frameworkinstallextras:
|
|
|
# This installs a few of the useful scripts in Tools/scripts
|
|
|
scriptsinstall:
|
|
|
SRCDIR=$(srcdir) $(RUNSHARED) \
|
|
@@ -142,7 +141,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in
|
|
|
--prefix=$(prefix) \
|
|
|
--install-scripts=$(BINDIR) \
|
|
|
--root=/$(DESTDIR)
|
|
|
-@@ -1139,7 +1142,7 @@ config.status: $(srcdir)/configure
|
|
|
+@@ -1139,7 +1141,7 @@ config.status: $(srcdir)/configure
|
|
|
|
|
|
# Run reindent on the library
|
|
|
reindent:
|
|
@@ -151,7 +150,7 @@ diff -Nur Python-2.7.1.orig/Makefile.pre.in Python-2.7.1/Makefile.pre.in
|
|
|
|
|
|
# Rerun configure with the same options as it was run last time,
|
|
|
# provided the config.status script exists
|
|
|
-@@ -1242,7 +1245,7 @@ funny:
|
|
|
+@@ -1242,7 +1244,7 @@ funny:
|
|
|
|
|
|
# Perform some verification checks on any modified files.
|
|
|
patchcheck:
|