diff options
| author | David Spencer <baildon.research@googlemail.com> | 2018-10-20 23:34:53 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-10-21 06:47:03 +0700 |
| commit | 6b71a363e9e85bf83596ddc6e69bfe8956ae4046 (patch) | |
| tree | defc885de4a28b7b4252f09ca81de200222202f7 /gis/viking/viking.SlackBuild | |
| parent | 8bffeb7a3c9ea9e7069a43491b96f6e0cdb65475 (diff) | |
gis/viking: Fix build with gpsd-3.18.1.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'gis/viking/viking.SlackBuild')
| -rw-r--r-- | gis/viking/viking.SlackBuild | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gis/viking/viking.SlackBuild b/gis/viking/viking.SlackBuild index 2b4a3326eaad2..8ca0b8437e688 100644 --- a/gis/viking/viking.SlackBuild +++ b/gis/viking/viking.SlackBuild @@ -26,12 +26,12 @@ PRGNAM=viking VERSION=${VERSION:-1.6.2} -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 @@ -42,8 +42,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" @@ -71,6 +71,10 @@ 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 {} \; +# Patches ripped off from Arch (thanks!) +patch -p1 < $CWD/remove-mapquest.patch +patch -p0 < $CWD/viking-1.6.2-gpsd-3.18-fix.patch + OPT_MAPNIK='--disable-mapnik' if [ ${MAPNIK:-no} = "yes" ]; then OPT_MAPNIK="--enable-mapnik" |