42d74be742
* Tue Feb 19 2013 David Malcolm <dmalcolm@redhat.com> - 2.7.3-17 - remove "_default_patch_fuzz" directive to avoid patches being silently misapplied (refresh patch 1, patch 101, patch 102, patch 111, patch 121, patch 158; rename patch 1, patch 101, patch 121; apply patch 54 before the lib64 patches to avoid fuzz problems caused by the conditional application of the lib64 patches)
51 lines
2.0 KiB
Diff
51 lines
2.0 KiB
Diff
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:
|
|
|
|
|
|
# Build the interpreter
|
|
-$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY)
|
|
+$(BUILDPYTHON): Modules/python.o $(LDLIBRARY)
|
|
$(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)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
|
|
esac
|
|
|
|
-# Build static library
|
|
-# avoid long command lines, same as LIBRARY_OBJS
|
|
-$(LIBRARY): $(LIBRARY_OBJS)
|
|
- -rm -f $@
|
|
- $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o
|
|
- $(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
|
|
- $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
|
|
- $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS)
|
|
- $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
|
|
- $(AR) $(ARFLAGS) $@ $(MODOBJS)
|
|
- $(RANLIB) $@
|
|
-
|
|
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
|
|
else true; \
|
|
fi; \
|
|
done
|
|
- @if test -d $(LIBRARY); then :; else \
|
|
- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
|
|
- if test "$(SO)" = .dll; then \
|
|
- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
|
|
- else \
|
|
- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
|
- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
|
|
- fi; \
|
|
- else \
|
|
- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
|
|
- fi; \
|
|
- fi
|
|
$(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
|
|
$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
|
|
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
|