2014-01-29 13:13:02 +00:00
|
|
|
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:
|
2010-01-18 18:51:20 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
# 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)
|
2014-01-29 13:13:02 +00:00
|
|
|
@@ -464,18 +464,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
|
|
|
|
|
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
|
Updated to Python 2.7.4.
- Refreshed patches: 0 (config), 7 (sqlite encoding), 16 (rpath in config),
55 (systemtap), 111 (no static lib), 112 (debug build), 113 (more
configuration flags), 130 (add extension to python config), 134 (fix
COUNT_ALLOCS in test_sys), 146 (haslib FIPS), 147 (add debug malloc stats),
153 (fix gdb test noise), 157 (uid, gid overflow - fixed upstream, just
keeping few more downstream tests), 165 (crypt module salt backport),
175 (fix configure Wformat), 5000 (regenerated autotooling patch)
- Dropped patches: 101 (lib64 regex; merged upstream), 171 (exception on
missing /dev/urandom; merged upstream), 172 (poll for multiprocessing socket
connection; merged upstream)
2013-04-09 08:54:58 +00:00
|
|
|
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
|
2010-01-18 18:51:20 +00:00
|
|
|
|
|
|
|
|
-# Build static library
|
|
|
|
|
-# avoid long command lines, same as LIBRARY_OBJS
|
|
|
|
|
-$(LIBRARY): $(LIBRARY_OBJS)
|
|
|
|
|
- -rm -f $@
|
2010-07-21 20:48:17 +00:00
|
|
|
- $(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)
|
2010-01-18 18:51:20 +00:00
|
|
|
- $(RANLIB) $@
|
|
|
|
|
-
|
|
|
|
|
libpython$(VERSION).so: $(LIBRARY_OBJS)
|
|
|
|
|
if test $(INSTSONAME) != $(LDLIBRARY); then \
|
2013-02-19 20:19:54 +00:00
|
|
|
$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
|
2014-01-29 13:13:02 +00:00
|
|
|
@@ -1097,18 +1085,6 @@ libainstall: all python-config
|
2010-01-18 18:51:20 +00:00
|
|
|
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
|
