summaryrefslogtreecommitdiff
path: root/games/glob2/glob2.SlackBuild
diff options
context:
space:
mode:
authorDimitris Zlatanidis <d.zlatanidis@gmail.com>2016-09-22 04:25:24 +0300
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-09-24 07:05:14 +0700
commit5358a796c573d9653a8f64514a275381599981f6 (patch)
tree4f9322bb454269ccdaf8690616ea2de78cc58366 /games/glob2/glob2.SlackBuild
parentee359610bf39ba9612d8a0918270fd5358b99c94 (diff)
downloadslackbuilds-5358a796c573d9653a8f64514a275381599981f6.tar.gz
games/glob2: Switch to i586 and merge patches.
Signed-off-by: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
Diffstat (limited to 'games/glob2/glob2.SlackBuild')
-rw-r--r--games/glob2/glob2.SlackBuild16
1 files changed, 7 insertions, 9 deletions
diff --git a/games/glob2/glob2.SlackBuild b/games/glob2/glob2.SlackBuild
index 1e62ddebd4..6bb719cd26 100644
--- a/games/glob2/glob2.SlackBuild
+++ b/games/glob2/glob2.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for glob2
-# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# Copyright 2014-2016 Dimitris Zlatanidis Orestiada, Greece
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,12 @@
PRGNAM=glob2
VERSION=${VERSION:-0.9.4.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -67,11 +67,9 @@ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-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 {} \;
-patch -p1 < $CWD/TextStream_headers.patch
-patch -p1 < $CWD/SConstruct_boost.patch
-patch -p1 < $CWD/fix-ftbfs-gcc49.diff
+patch -p1 < $CWD/fixes.patch
mkdir -p $PKG/usr/bin \
$PKG/usr/share/games/$PRGNAM