mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
72b3c9e90f
d/python-2.7.17-x86_64-2.txz: Removed. d/python2-2.7.18-x86_64-1.txz: Added. OK, I know a few people got excited seeing python-2 removed in the previous entry, but it's just being renamed to python2 for consistency with the python3 package. It's DOA though, and is the final release of the already EOL python 2 branch (a "commemorative" release as they say in the announcement). l/M2Crypto-0.35.2-x86_64-3.txz: Rebuilt. Added python3 modules. Thanks to sombragris and ponce. l/harfbuzz-2.6.5-x86_64-1.txz: Upgraded. l/imagemagick-7.0.10_7-x86_64-1.txz: Upgraded. l/libuv-1.37.0-x86_64-1.txz: Upgraded. l/libyaml-0.2.4-x86_64-1.txz: Upgraded. l/oniguruma-6.9.5-x86_64-1.txz: Upgraded. x/pixman-0.40.0-x86_64-1.txz: Upgraded.
49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
--- ./Makefile.pre.in.orig 2012-04-09 18:07:33.000000000 -0500
|
|
+++ ./Makefile.pre.in 2012-05-09 13:38:24.913226185 -0500
|
|
@@ -396,7 +396,7 @@
|
|
|
|
|
|
# Build the interpreter
|
|
-$(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY)
|
|
+$(BUILDPYTHON): Modules/python.o $(LDLIBRARY)
|
|
$(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \
|
|
Modules/python.o \
|
|
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
|
@@ -412,18 +412,6 @@
|
|
*) $(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); \
|
|
@@ -1008,18 +996,6 @@
|
|
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
|