From 9ba10723f7688b3b056416f062d80d3745dad685 Mon Sep 17 00:00:00 2001 From: David Spencer Date: Fri, 11 Dec 2015 17:57:54 +0000 Subject: games/garden: Fixed build with gcc-5.2.0. Bring SlackBuild into line with template. Signed-off-by: David Spencer Signed-off-by: Willy Sudiarto Raharjo --- games/garden/garden.SlackBuild | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/games/garden/garden.SlackBuild b/games/garden/garden.SlackBuild index 72afd9d19a..b2fcbcf6fa 100644 --- a/games/garden/garden.SlackBuild +++ b/games/garden/garden.SlackBuild @@ -43,14 +43,14 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "${ARCH}" == "i486" ];then - SLKCFLAGS='-march=i486 -mtune=i686' +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" == "i686" ]; then - SLKCFLAGS="-march=i686 -mtune=i686" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" -elif [ "${ARCH}" == "x86_64" ];then - SLKCFLAGS='-fPIC' +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -59,10 +59,10 @@ fi set -e -rm -Rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -Rf $PRGNAM +rm -rf $PRGNAM tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . @@ -72,6 +72,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +CFLAGS="$SLKCFLAGS -fgnu89-inline" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --bindir=/usr/games -- cgit v1.2.3-65-gdbad