diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/d/gdb/gdb.SlackBuild | 7 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-6.1.65 (renamed from source/k/kernel-configs/config-generic-6.1.64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-6.1.65.x64 (renamed from source/k/kernel-configs/config-generic-6.1.64.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-smp-6.1.65-smp (renamed from source/k/kernel-configs/config-generic-smp-6.1.64-smp) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-6.1.65 (renamed from source/k/kernel-configs/config-huge-6.1.64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-6.1.65.x64 (renamed from source/k/kernel-configs/config-huge-6.1.64.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-smp-6.1.65-smp (renamed from source/k/kernel-configs/config-huge-smp-6.1.64-smp) | 2 | ||||
-rwxr-xr-x | source/k/kernel-modules.SlackBuild | 14 | ||||
-rw-r--r-- | source/l/enchant/enchant.url | 2 | ||||
-rwxr-xr-x | source/l/v4l-utils/v4l-utils.SlackBuild | 5 | ||||
-rw-r--r-- | source/l/v4l-utils/v4l-utils.gconv.link.patch | 10 |
11 files changed, 32 insertions, 18 deletions
diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild index 5e5ea831a..5ef2ad333 100755 --- a/source/d/gdb/gdb.SlackBuild +++ b/source/d/gdb/gdb.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2020, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -63,7 +63,8 @@ mkdir -p $TMP $PKG cd $TMP rm -rf gdb-$VERSION -tar xvf $CWD/gdb-$VERSION.tar.xz || exit 1 +echo "Extracting $CWD/gdb-$VERSION.tar.xz..." +tar xf $CWD/gdb-$VERSION.tar.xz || exit 1 cd gdb-$VERSION || exit 1 chown -R root:root . find . \ @@ -73,7 +74,7 @@ find . \ -exec chmod 644 {} \+ # This has been perpetually broken, so we'll default to turning it off: -GUILE_OPTION=${GUILE_OPTION:"--without-guile"} +GUILE_OPTION=${GUILE_OPTION:-"--without-guile"} # Make a build directory: mkdir build-gdb diff --git a/source/k/kernel-configs/config-generic-6.1.64 b/source/k/kernel-configs/config-generic-6.1.65 index 39e590ecd..502d611c7 100644 --- a/source/k/kernel-configs/config-generic-6.1.64 +++ b/source/k/kernel-configs/config-generic-6.1.65 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.64 Kernel Configuration +# Linux/x86 6.1.65 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-6.1.64.x64 b/source/k/kernel-configs/config-generic-6.1.65.x64 index ff8e80b95..ee93a03e0 100644 --- a/source/k/kernel-configs/config-generic-6.1.64.x64 +++ b/source/k/kernel-configs/config-generic-6.1.65.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.64 Kernel Configuration +# Linux/x86 6.1.65 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-generic-smp-6.1.64-smp b/source/k/kernel-configs/config-generic-smp-6.1.65-smp index 43b2ec394..7b80e6cea 100644 --- a/source/k/kernel-configs/config-generic-smp-6.1.64-smp +++ b/source/k/kernel-configs/config-generic-smp-6.1.65-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.64 Kernel Configuration +# Linux/x86 6.1.65 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-6.1.64 b/source/k/kernel-configs/config-huge-6.1.65 index f71618554..8e31e7fe3 100644 --- a/source/k/kernel-configs/config-huge-6.1.64 +++ b/source/k/kernel-configs/config-huge-6.1.65 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.64 Kernel Configuration +# Linux/x86 6.1.65 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-6.1.64.x64 b/source/k/kernel-configs/config-huge-6.1.65.x64 index 7c98aaa6e..56541bdfa 100644 --- a/source/k/kernel-configs/config-huge-6.1.64.x64 +++ b/source/k/kernel-configs/config-huge-6.1.65.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.64 Kernel Configuration +# Linux/x86 6.1.65 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-configs/config-huge-smp-6.1.64-smp b/source/k/kernel-configs/config-huge-smp-6.1.65-smp index a036221b5..41d22094b 100644 --- a/source/k/kernel-configs/config-huge-smp-6.1.64-smp +++ b/source/k/kernel-configs/config-huge-smp-6.1.65-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.64 Kernel Configuration +# Linux/x86 6.1.65 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/source/k/kernel-modules.SlackBuild b/source/k/kernel-modules.SlackBuild index d7df6d3c4..fa3cd1639 100755 --- a/source/k/kernel-modules.SlackBuild +++ b/source/k/kernel-modules.SlackBuild @@ -41,8 +41,12 @@ BUILD=${BUILD:-1} # The CONFIG_DEBUG_INFO_BTF_MODULES option adds a huge amount of debugging # data to the modules which we don't actually need. We'll strip debugging # information from kernel modules by default. If you are building a debug -# kernel and wish to retain this data, export the variable below set to "NO". -STRIP_DEBUG=${STRIP_DEBUG:-YES} +# kernel and wish to retain this data, export the variable below set to "0". +STRIP_DEBUG=${STRIP_DEBUG:-1} + +# Let's export the variable with the name needed by the kernel's Makefiles, +# just for good measure. +export INSTALL_MOD_STRIP=$STRIP_DEBUG if [ ! -r "${KERNEL_CONFIG}" ]; then echo "Error: the KERNEL_CONFIG environment variable needs to be set to the" @@ -115,11 +119,7 @@ fi echo "Building kernel modules..." make $NUMJOBS modules || exit 1 echo "Installing kernel modules to $PKG..." - make INSTALL_MOD_PATH=$PKG modules_install || exit 1 - if [ "$STRIP_DEBUG" = "YES" ]; then - echo "Stripping debug info from kernel modules..." - find $PKG -name "*.ko" -exec strip --strip-debug "{}" \; - fi + make INSTALL_MOD_PATH=$PKG INSTALL_MOD_STRIP=$STRIP_DEBUG modules_install || exit 1 # Fix build and source symlinks if they are pointing into $TMP: ( cd $PKG/lib/modules/${VERSION}${LOCALVERSION} for symlink in build source ; do diff --git a/source/l/enchant/enchant.url b/source/l/enchant/enchant.url index c9f30e9cf..7485e8514 100644 --- a/source/l/enchant/enchant.url +++ b/source/l/enchant/enchant.url @@ -1,2 +1,2 @@ https://github.com/AbiWord/enchant -https://github.com/AbiWord/enchant/releases/download/v2.6.2/enchant-2.6.2.tar.gz +https://github.com/AbiWord/enchant/releases/download/v2.6.3/enchant-2.6.3.tar.gz diff --git a/source/l/v4l-utils/v4l-utils.SlackBuild b/source/l/v4l-utils/v4l-utils.SlackBuild index 866f2538c..a25554c80 100755 --- a/source/l/v4l-utils/v4l-utils.SlackBuild +++ b/source/l/v4l-utils/v4l-utils.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=v4l-utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -79,6 +79,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Make sure the gconv modules are linked properly: +cat $CWD/v4l-utils.gconv.link.patch | patch -p1 --verbose || exit 1 + # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" diff --git a/source/l/v4l-utils/v4l-utils.gconv.link.patch b/source/l/v4l-utils/v4l-utils.gconv.link.patch new file mode 100644 index 000000000..5432d58c0 --- /dev/null +++ b/source/l/v4l-utils/v4l-utils.gconv.link.patch @@ -0,0 +1,10 @@ +--- ./contrib/gconv/meson.build.orig 2023-11-25 07:27:49.000000000 -0600 ++++ ./contrib/gconv/meson.build 2023-12-03 12:52:06.319957999 -0600 +@@ -16,6 +16,7 @@ + arib_std_b24_sources, + name_prefix : '', + dependencies : arib_std_b24_deps, ++ link_args : [ '-Wl,--enable-new-dtags', '-Wl,-rpath=$ORIGIN' ], + install : true, + install_dir : gconv_install_dir, + include_directories : v4l2_utils_incdir) |