From 6180f30d3224ed1bbc10fab0a807fc08f53cbd9d Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Wed, 28 Jul 2021 14:32:14 -0400 Subject: mkslackinfo: update template for -current --- mkslackinfo | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/mkslackinfo b/mkslackinfo index 40198dd..41a2487 100755 --- a/mkslackinfo +++ b/mkslackinfo @@ -29,6 +29,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ --build=$ARCH-slackware-linux make @@ -245,7 +246,7 @@ print $f $content; close $f; __DATA__ -#!/bin/sh +#!/bin/bash # Slackware build script for __PRGNAM__ @@ -253,10 +254,13 @@ __DATA__ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=__PRGNAM__ VERSION=${VERSION:-__VERSION__} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -266,6 +270,11 @@ if [ -z "$ARCH" ]; then esac fi +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -298,6 +307,8 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ __BUILD__ +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + 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 @@ -322,4 +333,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE -- cgit v1.2.3