system/klish: Build with lua51.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

2 files changed, 20 insertions, 22 deletions

diff --git a/system/klish/klish.SlackBuild b/system/klish/klish.SlackBuild
index ac86fe216674..08b349fee78d 100644
--- a/system/klish/klish.SlackBuild
+++ b/system/klish/klish.SlackBuild
@@ -22,11 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20241021 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - build with lua51.
+# - get rid of static libraries.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=klish
 VERSION=${VERSION:-2.1.4}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +42,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -73,14 +74,16 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 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 \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
+# 20241021 bkw: no easier way to force lua51 than these env vars.
+# the -Wl,-s makes it strip everything.
+LUA_INCLUDE=-I/usr/include/lua5.1 \
+LUA_LIB=-llua5.1 \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="-Wl,-s" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -91,23 +94,20 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-lua \
   --with-libxml2 \
   --with-linxslt \
+  --enable-shared \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make
 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
+rm -f $PKG/usr/lib*/*.la
 
 mkdir -p $PKG/usr/man/man{1,8}
 export LD_LIBRARY_PATH="$PKG/usr/lib${LIBDIRSUFFIX}:$LD_LIBRARY_PATH"
-help2man      $PKG/usr/bin/clish   > $PKG/usr/man/man1/clish.1
-help2man      $PKG/usr/bin/konf    > $PKG/usr/man/man1/konf.1
-help2man      $PKG/usr/bin/sigexec > $PKG/usr/man/man1/sigexec.1
-help2man -s 8 $PKG/usr/bin/konfd   > $PKG/usr/man/man8/konfd.8
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+help2man      $PKG/usr/bin/clish   | gzip -9 > $PKG/usr/man/man1/clish.1.gz
+help2man      $PKG/usr/bin/konf    | gzip -9 > $PKG/usr/man/man1/konf.1.gz
+help2man      $PKG/usr/bin/sigexec | gzip -9 > $PKG/usr/man/man1/sigexec.1.gz
+help2man -s 8 $PKG/usr/bin/konfd   | gzip -9 > $PKG/usr/man/man8/konfd.8.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -115,8 +115,6 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-rm -f $PKG/usr/lib*/*.la
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/system/klish/klish.info b/system/klish/klish.info
index e7a675c544b7..7776fa601d1d 100644
--- a/system/klish/klish.info
+++ b/system/klish/klish.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://libcode.org/attachments/download/70/klish-2.1.4.tar.xz"
 MD5SUM="57a0b39b6e0a450007ee9e0b2ff50f03"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lua"
+REQUIRES="lua51"
 MAINTAINER="Jan F. Chadima"
 EMAIL="jfch@jagda.eu"