[python] Fixed no-static-lib patch
Tomas Radej
tradej at fedoraproject.org
Thu Jan 30 12:44:33 UTC 2014
commit 8dfcdaa46dacf1a3ac719b9828b6901fa4f63053
Author: Tomas Radej <tradej at redhat.com>
Date: Wed Jan 29 14:13:02 2014 +0100
Fixed no-static-lib patch
00111-no-static-lib.patch | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/00111-no-static-lib.patch b/00111-no-static-lib.patch
index 2f4fdd6..70dfb77 100644
--- a/00111-no-static-lib.patch
+++ b/00111-no-static-lib.patch
@@ -1,7 +1,7 @@
-diff -up Python-2.7.3/Makefile.pre.in.no-static-lib Python-2.7.3/Makefile.pre.in
---- Python-2.7.3/Makefile.pre.in.no-static-lib 2013-02-19 14:03:40.801993224 -0500
-+++ Python-2.7.3/Makefile.pre.in 2013-02-19 14:04:44.070988898 -0500
-@@ -397,7 +397,7 @@ coverage:
+diff -up Python-2.7.6/Makefile.pre.in.no-static-lib Python-2.7.6/Makefile.pre.in
+--- Python-2.7.6/Makefile.pre.in.no-static-lib 2014-01-29 13:58:32.933226720 +0100
++++ Python-2.7.6/Makefile.pre.in 2014-01-29 14:10:25.002247272 +0100
+@@ -437,7 +437,7 @@ coverage:
# Build the interpreter
@@ -10,8 +10,8 @@ diff -up Python-2.7.3/Makefile.pre.in.no-static-lib Python-2.7.3/Makefile.pre.in
$(LINKCC) $(CFLAGS) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
Modules/python.o \
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-@@ -413,18 +413,6 @@ sharedmods: $(BUILDPYTHON)
- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+@@ -464,18 +464,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
+ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-# Build static library
@@ -29,7 +29,7 @@ diff -up Python-2.7.3/Makefile.pre.in.no-static-lib Python-2.7.3/Makefile.pre.in
libpython$(VERSION).so: $(LIBRARY_OBJS)
if test $(INSTSONAME) != $(LDLIBRARY); then \
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-@@ -1021,18 +1009,6 @@ libainstall: all python-config
+@@ -1097,18 +1085,6 @@ libainstall: all python-config
else true; \
fi; \
done
More information about the scm-commits
mailing list