libraries/spdlog: Updated for version 1.11.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 46 insertions, 15 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 b68e51ae22..a7fc75af92 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 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,14 +24,12 @@
 #  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.11.0}
 BUILD=${BUILD:-1}
+FMT=${FMT:-ON}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -65,7 +64,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,7 +87,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
@@ -100,8 +106,29 @@ cd build
   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 \
+      -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
diff --git a/libraries/spdlog/spdlog.info b/libraries/spdlog/spdlog.info
index 9dc0a9f36c..46a746002a 100644
--- a/libraries/spdlog/spdlog.info
+++ b/libraries/spdlog/spdlog.info
@@ -1,10 +1,10 @@
 PRGNAM="spdlog"
-VERSION="1.10.0"
+VERSION="1.11.0"
 HOMEPAGE="https://github.com/gabime/spdlog"
-DOWNLOAD="https://github.com/gabime/spdlog/archive/v1.10.0/spdlog-1.10.0.tar.gz"
-MD5SUM="effea813cd81cfb5588806c5754e14f1"
+DOWNLOAD="https://github.com/gabime/spdlog/archive/v1.11.0/spdlog-1.11.0.tar.gz"
+MD5SUM="287c6492c25044fd2da9947ab120b2bd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="Steven Voges"
+EMAIL="svoges.sbo@gmail.com"