4 files changed, 62 insertions, 22 deletions
diff --git a/libraries/spdlog/README b/libraries/spdlog/README
index 0afd9e64a1..3759669027 100644
--- a/libraries/spdlog/README
+++ b/libraries/spdlog/README
@@ -1,3 +1,7 @@
 Very fast, header-only/compiled, C++ logging library.
 
-fmt is an optional dependency.
+fmt is an optional dependency and will be autodetected if installed.
+
+This scripts builds both 32bit and 64bit libraries by autodetecting
+multilib. If you are on a multilib system and only wish to build the
+64bit library, pass COMPAT32=no to the build script.
diff --git a/libraries/spdlog/slack-desc b/libraries/spdlog/slack-desc
index 12a47c8e36..fc45d5b4a5 100644
--- a/libraries/spdlog/slack-desc
+++ b/libraries/spdlog/slack-desc
@@ -10,7 +10,7 @@ spdlog: spdlog (Fast C++ logging library)
 spdlog:
 spdlog: Very fast, header-only/compiled, C++ logging library.
 spdlog:
-spdlog: https://github.com/gabime/spdlog
+spdlog: Homepage: https://github.com/gabime/spdlog
 spdlog:
 spdlog:
 spdlog:
diff --git a/libraries/spdlog/spdlog.SlackBuild b/libraries/spdlog/spdlog.SlackBuild
index 029d456316..b94c82e6cb 100644
--- a/libraries/spdlog/spdlog.SlackBuild
+++ b/libraries/spdlog/spdlog.SlackBuild
@@ -1,9 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for spdlog
 
-# Copyright 2017 Andre Barboza, Belo Horizonte - Brazil
+# Copyright 2023-2024 Steven Voges <Oregon, USA>
 # Copyright 2019-2020 Hunter Sezen California, USA
+# Copyright 2017 Andre Barboza, Belo Horizonte - Brazil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=spdlog
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-1.14.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +40,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,7 +63,15 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -eu
+#Test for multilib
+COMPAT32=${COMPAT32@L}
+COMPATTMP="$( mktemp -d $TMP/compat32-test-XXXXXX )"
+echo "int main(void) {; return(0); }" > "$COMPATTMP/test.c"
+gcc -m32 "$COMPATTMP/test.c" -o /dev/null >/dev/null 2>&1 \
+  && COMPAT32=${COMPAT32:-yes}
+rm -rf "$COMPATTMP"
+
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -66,12 +82,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-FMT=OFF
-pkg-config --exists fmt && FMT=ON
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 mkdir -p build
 cd build
@@ -83,18 +96,41 @@ cd build
     -DSPDLOG_BUILD_TESTS=ON \
     -DSPDLOG_BUILD_BENCH=OFF \
     -DSPDLOG_BUILD_EXAMPLE=OFF \
-    -DSPDLOG_FMT_EXTERNAL=$FMT \
+    -DSPDLOG_FMT_EXTERNAL=OFF \
+    -DCMAKE_SKIP_RPATH=TRUE \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
+if [ "$COMPAT32" = "yes" ]; then
+  mkdir -p build32
+  cd build32
+    cmake \
+      -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -m32" \
+      -DCMAKE_SHARED_LINKER_FLAGS:STRING="-m32" \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_INSTALL_LIBDIR=lib \
+      -DSPDLOG_BUILD_SHARED=ON \
+      -DSPDLOG_BUILD_TESTS=ON \
+      -DSPDLOG_BUILD_BENCH=OFF \
+      -DSPDLOG_BUILD_EXAMPLE=OFF \
+      -DSPDLOG_FMT_EXTERNAL=OFF \
+      -DCMAKE_SKIP_RPATH=TRUE \
+      -DCMAKE_BUILD_TYPE=Release ..
+    make
+    make install/strip DESTDIR=$PKG
+  cd ..
+fi
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  LICENSE README.md \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/libraries/spdlog/spdlog.info b/libraries/spdlog/spdlog.info
index b734b776f8..e4584a4019 100644
--- a/libraries/spdlog/spdlog.info
+++ b/libraries/spdlog/spdlog.info
@@ -1,10 +1,10 @@
 PRGNAM="spdlog"
-VERSION="1.5.0"
+VERSION="1.14.1"
 HOMEPAGE="https://github.com/gabime/spdlog"
-DOWNLOAD="https://github.com/gabime/spdlog/archive/v1.5.0/spdlog-1.5.0.tar.gz"
-MD5SUM="a966eea01f81551527853d282896cb4d"
+DOWNLOAD="https://github.com/gabime/spdlog/archive/v1.14.1/spdlog-1.14.1.tar.gz"
+MD5SUM="f2c3f15c20e67b261836ff7bfda302cf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+REQUIRES="Catch2 fmt"
+MAINTAINER="Steven Voges"
+EMAIL="svoges.sbo@gmail.com"