4 files changed, 58 insertions, 25 deletions
diff --git a/libraries/skalibs/README b/libraries/skalibs/README
index 4a5597a7b3..c601481353 100644
--- a/libraries/skalibs/README
+++ b/libraries/skalibs/README
@@ -6,7 +6,27 @@ is that you won't have to download and compile big libraries, and care
 about portability issues, everytime you need to build a package: do it
 only once.
 
-skalibs can also be used as a sound basic start for C
-development. There are a lot of general-purpose libraries out there;
-but if your main goal is to produce small and secure C code with a
-focus on system programming, skalibs might be for you.
+skalibs can also be used as a sound basic start for C development.
+There are a lot of general-purpose libraries out there; but if your
+main goal is to produce small and secure C code with a focus on system
+programming, skalibs might be for you.
+
+NOTE:
+Upstream recommends building skarnet.org softwares with static libraries
+as most of skarnet.org softwares are small enough that using shared
+libraries are generally not worth using. Therefore, the SlackBuild
+script will only build the static libraries by default.
+
+If you want to also build the shared libraries, pass BUILD_SHARED=yes
+environment variable to the script like below:
+
+    BUILD_SHARED=yes ./skalibs.SlackBuild
+
+Similarly, to avoid building the static libraries, you can pass
+BUILD_STATIC=no to the script. For example, to only build the shared
+libraries and not the static ones, you can do something like
+
+    BUILD_SHARED=yes BUILD_STATIC=no ./skalibs.SlackBuild
+
+If you just want to build and use skarnet.org softwares, building only
+the static libraries should be sufficient.
diff --git a/libraries/skalibs/skalibs.SlackBuild b/libraries/skalibs/skalibs.SlackBuild
index e68bf0ce25..b4271019a2 100644
--- a/libraries/skalibs/skalibs.SlackBuild
+++ b/libraries/skalibs/skalibs.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for skalibs
 
 # Copyright 2019 Sean MacLennan Ottawa, Canada
+# Copyright 2020 Muhammad Mahendra Subrata Depok, Indonesia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=skalibs
-VERSION=${VERSION:-2.7.0.0}
+VERSION=${VERSION:-2.9.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,6 +55,20 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Upstream recommends building skarnet.org softwares using the static
+# version of skalibs so we are going to build just the static version of skalibs by default
+# If you need to build the shared libraries, just pass BUILD_SHARED=yes to this script
+BUILD_STATIC=${BUILD_STATIC:-yes}
+BUILD_SHARED=${BUILD_SHARED:-no}
+
+if [ "$BUILD_STATIC" = "no" ]; then
+	LIBS_CONF="--disable-static"
+fi
+
+if [ "$BUILD_SHARED" = "no" ]; then
+	LIBS_CONF="--disable-shared $LIBS_CONF"
+fi
+
 set -e
 
 rm -rf $PKG
@@ -69,21 +84,20 @@ 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 {} \;
 
-# Static library is needed here
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --dynlibdir=/usr/lib${LIBDIRSUFFIX} \
-  --build=$ARCH-slackware-linux
+  --libdir=/usr/lib${LIBDIRSUFFIX}/skalibs \
+  --dynlibdir=/lib${LIBDIRSUFFIX} \
+  --includedir=/usr/include \
+  --sysdepdir=/usr/lib${LIBDIRSUFFIX}/skalibs/sysdeps \
+  --datadir=/etc \
+  $LIBS_CONF
 
 make
+make strip
 make install DESTDIR=$PKG
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING INSTALL NEWS README doc $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/skalibs/skalibs.info b/libraries/skalibs/skalibs.info
index 2f7e11e546..68bb358c91 100644
--- a/libraries/skalibs/skalibs.info
+++ b/libraries/skalibs/skalibs.info
@@ -1,10 +1,10 @@
 PRGNAM="skalibs"
-VERSION="2.7.0.0"
+VERSION="2.9.1.0"
 HOMEPAGE="https://skarnet.org/software/skalibs/"
-DOWNLOAD="https://skarnet.org/software/skalibs/skalibs-2.7.0.0.tar.gz"
-MD5SUM="de26435512337650f6e1bcce3643710d"
+DOWNLOAD="https://skarnet.org/software/skalibs/skalibs-2.9.1.0.tar.gz"
+MD5SUM="2e8a84c1969eb7327b67b9a96dd7332d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Sean MacLennan"
-EMAIL="seanm@seanm.ca"
+MAINTAINER="Muhammad Mahendra Subrata"
+EMAIL="mumahendras3@gmail.com"
diff --git a/libraries/skalibs/slack-desc b/libraries/skalibs/slack-desc
index 62a5868bd6..12cb6a8087 100644
--- a/libraries/skalibs/slack-desc
+++ b/libraries/skalibs/slack-desc
@@ -6,14 +6,13 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-skalibs: skalibs (general purpose C libraries)
+skalibs: skalibs (general-purpose C libraries for skarnet.org softwares)
 skalibs:
 skalibs: skalibs is a package centralizing the free software / open source C
 skalibs: development files used for building all software at skarnet.org: it
-skalibs: contains essentially general-purpose libraries. The point is that
-skalibs: you won't have to download and compile big libraries, and care
-skalibs: about portability issues, everytime you need to build a package: do
-skalibs: it only once.
-skalibs:
-skalibs: https://skarnet.org/software/skalibs/
+skalibs: contains essentially general-purpose libraries. You will need to
+skalibs: install skalibs if you plan to build skarnet.org software. skalibs can
+skalibs: also be used as a general-purpose library. It is very suitable for
+skalibs: creating small and secure system programs.
 skalibs:
+skalibs: Homepage: https://skarnet.org/software/skalibs/