1 files changed, 16 insertions, 6 deletions
diff --git a/misc/heimdall/heimdall.SlackBuild b/misc/heimdall/heimdall.SlackBuild
index ac43f236bd..e9a025c218 100644
--- a/misc/heimdall/heimdall.SlackBuild
+++ b/misc/heimdall/heimdall.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Heimdall
 
@@ -22,10 +22,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=heimdall
 VERSION=${VERSION:-1.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 GUI=${GUI:-yes} # Heimdall Frontend support, enabled by default
 
 if [ -z "$ARCH" ]; then
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -74,7 +84,7 @@ find -L . \
 # This is a mandatory Heimdall component
 cd libpit
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=gnu++14" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -90,7 +100,7 @@ cd $TMP/$PRGNAM-suite-$VERSION
 # Compile and Install Heimdall
 cd heimdall
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=gnu++14" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -113,7 +123,7 @@ cd $TMP/$PRGNAM-suite-$VERSION
 case "$GUI" in
     yes)
     cd heimdall-frontend
-    qmake OUTPUTDIR=$PKG/usr/bin
+    qmake-qt4 OUTPUTDIR=$PKG/usr/bin
     make
     make install DESTDIR=$PKG
     cd $TMP/$PRGNAM-suite-$VERSION
@@ -136,4 +146,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