diff options
Diffstat (limited to 'python/python3/patches/python3.no-static-library.diff')
-rw-r--r-- | python/python3/patches/python3.no-static-library.diff | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/python/python3/patches/python3.no-static-library.diff b/python/python3/patches/python3.no-static-library.diff index dd7bdad6a1..c0e48bd9fb 100644 --- a/python/python3/patches/python3.no-static-library.diff +++ b/python/python3/patches/python3.no-static-library.diff @@ -1,7 +1,7 @@ -diff -uar Python-3.3.0.orig/Makefile.pre.in Python-3.3.0/Makefile.pre.in ---- Python-3.3.0.orig/Makefile.pre.in 2012-09-29 11:00:41.000000000 +0300 -+++ Python-3.3.0/Makefile.pre.in 2012-10-09 21:55:38.253943598 +0300 -@@ -463,7 +463,7 @@ +diff -uar Python-3.3.1.orig/Makefile.pre.in Python-3.3.1/Makefile.pre.in +--- Python-3.3.1.orig/Makefile.pre.in 2013-04-06 10:41:48.000000000 +0300 ++++ Python-3.3.1/Makefile.pre.in 2013-04-21 15:43:24.509324568 +0300 +@@ -471,7 +471,7 @@ # Build the interpreter @@ -9,8 +9,8 @@ diff -uar Python-3.3.0.orig/Makefile.pre.in Python-3.3.0/Makefile.pre.in +$(BUILDPYTHON): Modules/python.o $(LDLIBRARY) $(PY3LIBRARY) $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) - platform: $(BUILDPYTHON) $(SYSCONFIGDATA) -@@ -479,18 +479,6 @@ + platform: $(BUILDPYTHON) pybuilddir.txt +@@ -495,18 +495,6 @@ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build @@ -29,7 +29,7 @@ diff -uar Python-3.3.0.orig/Makefile.pre.in Python-3.3.0/Makefile.pre.in libpython$(LDVERSION).so: $(LIBRARY_OBJS) if test $(INSTSONAME) != $(LDLIBRARY); then \ $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ -@@ -580,7 +568,7 @@ +@@ -596,7 +584,7 @@ echo "-----------------------------------------------"; \ fi @@ -38,13 +38,13 @@ diff -uar Python-3.3.0.orig/Makefile.pre.in Python-3.3.0/Makefile.pre.in $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ############################################################################ -@@ -1148,18 +1136,6 @@ +@@ -1191,18 +1179,6 @@ else true; \ fi; \ done - @if test -d $(LIBRARY); then :; else \ - if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ -- if test "$(SO)" = .dll; then \ +- if test "$(SHLIB_SUFFIX)" = .dll; then \ - $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ - else \ - $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ |