diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-01-14 04:30:43 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-01-14 08:59:45 +0100 |
| commit | 8ec371c51c2deb7a0da8417685db5723ce14bec5 (patch) | |
| tree | 095264e8225b33b1456134bc5c93c198b3b8ceb6 /source/d | |
| parent | e6dca6f9460ca8b3504ff908a27d48bd533e4e16 (diff) | |
| download | current-8ec371c51c2deb7a0da8417685db5723ce14bec5.tar.gz | |
Mon Jan 14 04:30:43 UTC 201920190114043043
a/kernel-generic-4.19.15-x86_64-1.txz: Upgraded.
a/kernel-huge-4.19.15-x86_64-1.txz: Upgraded.
a/kernel-modules-4.19.15-x86_64-1.txz: Upgraded.
a/lzip-1.21-x86_64-1.txz: Upgraded.
ap/sudo-1.8.27-x86_64-1.txz: Upgraded.
d/kernel-headers-4.19.15-x86-1.txz: Upgraded.
d/python3-3.6.8-x86_64-1.txz: Upgraded.
k/kernel-source-4.19.15-noarch-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/d')
| -rw-r--r-- | source/d/python3/python3.no-static-library.diff | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/source/d/python3/python3.no-static-library.diff b/source/d/python3/python3.no-static-library.diff index 2821ca79..2e03ab8a 100644 --- a/source/d/python3/python3.no-static-library.diff +++ b/source/d/python3/python3.no-static-library.diff @@ -1,44 +1,36 @@ -diff -uar Python-3.6.0.orig/Makefile.pre.in Python-3.6.0/Makefile.pre.in ---- Python-3.6.0.orig/Makefile.pre.in 2016-12-23 04:21:21.000000000 +0200 -+++ Python-3.6.0/Makefile.pre.in 2016-12-27 22:50:14.139741226 +0200 -@@ -564,7 +564,7 @@ - $(RUNSHARED) $(PYTHON_FOR_BUILD) ./Tools/clinic/clinic.py --make +--- ./Makefile.pre.in.orig 2019-01-13 13:06:37.518767495 -0600 ++++ ./Makefile.pre.in 2019-01-13 13:28:41.778781670 -0600 +@@ -549,7 +549,7 @@ + $(PYTHON_FOR_REGEN) ./Tools/clinic/clinic.py --make # Build the interpreter -$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) +$(BUILDPYTHON): Programs/python.o $(LDLIBRARY) $(PY3LIBRARY) - $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) + $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) platform: $(BUILDPYTHON) pybuilddir.txt -@@ -609,18 +609,6 @@ +@@ -598,11 +598,6 @@ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build -# 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) Python/frozen.o -- $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) -- $(AR) $(ARFLAGS) $@ $(MODOBJS) -- $(RANLIB) $@ +- $(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS) - libpython$(LDVERSION).so: $(LIBRARY_OBJS) if test $(INSTSONAME) != $(LDLIBRARY); then \ $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ -@@ -710,7 +698,7 @@ +@@ -692,7 +687,7 @@ echo "-----------------------------------------------"; \ fi -Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) +Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY) - $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) + $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) ############################################################################ -@@ -1388,18 +1376,6 @@ +@@ -1428,17 +1423,6 @@ else true; \ fi; \ done @@ -48,7 +40,6 @@ diff -uar Python-3.6.0.orig/Makefile.pre.in Python-3.6.0/Makefile.pre.in - $(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; \ |