summaryrefslogtreecommitdiffstats
path: root/deps
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-06-17 14:16:12 +0200
committer Eric Hameleers <alien@slackware.com>2020-06-17 14:16:12 +0200
commit862c3bb234d9b603bbc5b1f1c5dbe60415a8e47f (patch)
tree5ff807a86b8147e4be7a561eeb8a37bf905f7b6f /deps
parent6126ac41f2d3e0596e4936d12cb16d8586beb394 (diff)
downloadktown-862c3bb234d9b603bbc5b1f1c5dbe60415a8e47f.tar.gz
ktown-862c3bb234d9b603bbc5b1f1c5dbe60415a8e47f.tar.xz
Deps/grantlee-qt4 SlackBuild polished for an overdue rebuild
Its SlackBuild did not yet follow the current script template, and the Qt4 based 'grantlee' package in Slackware itself was rebuilt in 2018 as part of the 'mass rebuild'; However I forgot to do the same for the 'grantlee-qt4' version in 'ktown'.
Diffstat (limited to 'deps')
-rwxr-xr-xdeps/grantlee-qt4/grantlee-qt4.SlackBuild26
1 files changed, 18 insertions, 8 deletions
diff --git a/deps/grantlee-qt4/grantlee-qt4.SlackBuild b/deps/grantlee-qt4/grantlee-qt4.SlackBuild
index e8107c8..33ac441 100755
--- a/deps/grantlee-qt4/grantlee-qt4.SlackBuild
+++ b/deps/grantlee-qt4/grantlee-qt4.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 2010, 2011, 2015 Eric Hameleers, Eindhoven, NL
-# Copyright 2010, 2011, 2015 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2011, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,18 +22,20 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
PKGNAM=grantlee-qt4
SRCNAM=grantlee
VERSION=${VERSION:-0.5.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
-NUMJOBS=${NUMJOBS:--j7}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
if [ -z "$ARCH" ]; then
case "$MARCH" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
armv7hl) export ARCH=$MARCH ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
@@ -41,8 +43,16 @@ if [ -z "$ARCH" ]; then
esac
fi
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+# 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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
@@ -71,9 +81,9 @@ cd $SRCNAM-$VERSION || exit 1
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
# Make sure this package does not clash with Qt5 based grantlee:
sed -i CMakeLists.txt \