diff options
Diffstat (limited to 'system/multiload-ng/multiload-ng.SlackBuild')
| -rw-r--r-- | system/multiload-ng/multiload-ng.SlackBuild | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/system/multiload-ng/multiload-ng.SlackBuild b/system/multiload-ng/multiload-ng.SlackBuild index dc76e3a6d5..a30f27c3d3 100644 --- a/system/multiload-ng/multiload-ng.SlackBuild +++ b/system/multiload-ng/multiload-ng.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for multiload-ng @@ -22,10 +22,17 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220210 bkw: Modified by SlackBuilds.org: fix the build on 15.0. I +# had to disable the XFCE4 plugin; if you know how to fix it, please +# send a patch. + +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=multiload-ng VERSION=${VERSION:-1.5.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -84,10 +95,11 @@ case "$SYSTRAY" in *) SYSTRAY="yes" ;; esac -# default is to build the xfce4 panel plugin +# 20220210 bkw: default is to NOT build the xfce4 panel plugin, +# because it fails to build on 15.0. case "$XFCE4" in - no) ;; - *) XFCE4="yes" ;; + yes) XFCE4="yes" ;; + *) XFCE4="no" ;; esac set -e @@ -101,12 +113,14 @@ 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 \ + -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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ ./autogen.sh +SLKCFLAGS+=" -fcommon" + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -122,10 +136,7 @@ CXXFLAGS="$SLKCFLAGS" \ --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 +make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS Changelog.md CONTRIBUTING.md COPYING README.md \ @@ -137,4 +148,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 |