diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/a/lzip/lzip.SlackBuild | 2 | ||||
-rw-r--r-- | source/d/python3/python3.no-static-library.diff | 29 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-4.19.15 (renamed from source/k/kernel-configs/config-generic-4.19.14) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-4.19.15.x64 (renamed from source/k/kernel-configs/config-generic-4.19.14.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-smp-4.19.15-smp (renamed from source/k/kernel-configs/config-generic-smp-4.19.14-smp) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-4.19.15 (renamed from source/k/kernel-configs/config-huge-4.19.14) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-4.19.15.x64 (renamed from source/k/kernel-configs/config-huge-4.19.14.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-smp-4.19.15-smp (renamed from source/k/kernel-configs/config-huge-smp-4.19.14-smp) | 2 |
8 files changed, 17 insertions, 26 deletions
diff --git a/source/a/lzip/lzip.SlackBuild b/source/a/lzip/lzip.SlackBuild index ce1e0e11..2660cdf4 100755 --- a/source/a/lzip/lzip.SlackBuild +++ b/source/a/lzip/lzip.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=lzip VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then 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; \ diff --git a/source/k/kernel-configs/config-generic-4.19.14 b/source/k/kernel-configs/config-generic-4.19.15 index 0b9c6e2c..a5f918ee 100644 --- a/source/k/kernel-configs/config-generic-4.19.14 +++ b/source/k/kernel-configs/config-generic-4.19.15 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.14 Kernel Configuration +# Linux/x86 4.19.15 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-4.19.14.x64 b/source/k/kernel-configs/config-generic-4.19.15.x64 index a7c3f0cd..39597115 100644 --- a/source/k/kernel-configs/config-generic-4.19.14.x64 +++ b/source/k/kernel-configs/config-generic-4.19.15.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.14 Kernel Configuration +# Linux/x86 4.19.15 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-4.19.14-smp b/source/k/kernel-configs/config-generic-smp-4.19.15-smp index 6fae2297..6f90ccf2 100644 --- a/source/k/kernel-configs/config-generic-smp-4.19.14-smp +++ b/source/k/kernel-configs/config-generic-smp-4.19.15-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.14 Kernel Configuration +# Linux/x86 4.19.15 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.14 b/source/k/kernel-configs/config-huge-4.19.15 index 1dc4e425..60934a17 100644 --- a/source/k/kernel-configs/config-huge-4.19.14 +++ b/source/k/kernel-configs/config-huge-4.19.15 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.14 Kernel Configuration +# Linux/x86 4.19.15 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.14.x64 b/source/k/kernel-configs/config-huge-4.19.15.x64 index c3ba1fc9..ca49052f 100644 --- a/source/k/kernel-configs/config-huge-4.19.14.x64 +++ b/source/k/kernel-configs/config-huge-4.19.15.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.14 Kernel Configuration +# Linux/x86 4.19.15 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-4.19.14-smp b/source/k/kernel-configs/config-huge-smp-4.19.15-smp index 315d3ce2..b25bd276 100644 --- a/source/k/kernel-configs/config-huge-smp-4.19.14-smp +++ b/source/k/kernel-configs/config-huge-smp-4.19.15-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.14 Kernel Configuration +# Linux/x86 4.19.15 Kernel Configuration # # |