1 files changed, 36 insertions, 11 deletions
diff --git a/libraries/spdlog/spdlog.SlackBuild b/libraries/spdlog/spdlog.SlackBuild
index b68e51ae22..b94c82e6cb 100644
--- a/libraries/spdlog/spdlog.SlackBuild
+++ b/libraries/spdlog/spdlog.SlackBuild
@@ -2,8 +2,9 @@
 
 # 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,13 +24,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# 20220419 bkw: Modified by SlackBuilds.org, BUILD=2:
-# - strip libraries.
-
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=spdlog
-VERSION=${VERSION:-1.10.0}
+VERSION=${VERSION:-1.14.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -65,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
@@ -80,9 +86,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-FMT=ON
-pkg-config --exists fmt || FMT=OFF
-
 mkdir -p build
 cd build
   cmake \
@@ -93,15 +96,37 @@ 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/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