2 files changed, 35 insertions, 41 deletions
diff --git a/libraries/luadbi/README b/libraries/luadbi/README
index ac0d4e4d98..8dc97ad411 100644
--- a/libraries/luadbi/README
+++ b/libraries/luadbi/README
@@ -18,3 +18,8 @@ psql
 sqlite3
 db2
 oracle
+
+By default, mysql and sqlite3 support are built.
+
+Optional dependency: lua51. If lua51 is installed at build time, this
+package will contain a module for Lua 5.1.
diff --git a/libraries/luadbi/luadbi.SlackBuild b/libraries/luadbi/luadbi.SlackBuild
index 18c236c00d..20cebff666 100644
--- a/libraries/luadbi/luadbi.SlackBuild
+++ b/libraries/luadbi/luadbi.SlackBuild
@@ -22,11 +22,14 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20241023 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - build for lua 5.4 and lua51.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=luadbi
 VERSION=${VERSION:-0.7.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +41,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
@@ -61,18 +61,11 @@ OUTPUT=${OUTPUT:-/tmp}
 
 DBs=${DBs:-mysql sqlite3}
 
+SLKCFLAGS="-O2 -fPIC" # all arches need PIC
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
+  SLKCFLAGS+=" -O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
+  SLKCFLAGS+=" -O2 -march=i686 -mtune=i686"
 fi
 
 set -e
@@ -84,35 +77,31 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 {} \;
-
-make \
-  $DBs \
-  LUA_V=5.1 \
-  LUA_CDIR=$PKG/usr/lib$LIBDIRSUFFIX/lua/5.1 \
-  LUA_LDIR=$PKG/usr/share/lua/5.1 \
-  CFLAGS="$SLKCFLAGS"
-
-for t in $DBs ; do
-make \
-  install_$t \
-  LUA_V=5.1 \
-  LUA_CDIR=$PKG/usr/lib$LIBDIRSUFFIX/lua/5.1 \
-  LUA_LDIR=$PKG/usr/share/lua/5.1 \
-  CFLAGS="$SLKCFLAGS"
-done
-
-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
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
+
+runmake() {
+  local cmod=$( pkg-config $1 --variable INSTALL_CMOD )
+  local lmod=$( pkg-config $1 --variable INSTALL_LMOD )
+  local incs=$( pkg-config $1 --variable INSTALL_INC )
+
+  make clean
+  make $DBs LUA_INC=-I$incs CFLAGS="$SLKCFLAGS"
+
+  for t in $DBs ; do
+    make \
+      install_$t \
+      LUA_CDIR=$PKG/$cmod \
+      LUA_LDIR=$PKG/$lmod \
+      INSTALL_PROGRAM="install -s"
+  done
+}
+
+runmake lua
+[ -x /usr/bin/lua51 ] && runmake lua51
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  COPYING INSTALL README.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install