diff options
author | Eric Hameleers <alien@slackware.com> | 2018-06-13 14:50:49 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-06-13 14:50:49 +0200 |
commit | c779e019ac53019baa07eb843aba59bc55ffec20 (patch) | |
tree | f4dd959f71cea6ac6a8741a1a8f9933a389f5bc7 /deps/telepathy/telepathy-gabble | |
parent | e0d005c66dbed44be15070995d9d9e9200c989fa (diff) | |
download | ktown-c779e019ac53019baa07eb843aba59bc55ffec20.tar.gz ktown-c779e019ac53019baa07eb843aba59bc55ffec20.tar.xz |
Updated 'testing' in preparation for June '18 release of Plasma 5.13
Diffstat (limited to 'deps/telepathy/telepathy-gabble')
-rw-r--r-- | deps/telepathy/telepathy-gabble/.url (renamed from deps/telepathy/telepathy-gabble/telepathy-gabble.url) | 2 | ||||
-rwxr-xr-x | deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild | 21 |
2 files changed, 11 insertions, 12 deletions
diff --git a/deps/telepathy/telepathy-gabble/telepathy-gabble.url b/deps/telepathy/telepathy-gabble/.url index 9094aa8..d5aa873 100644 --- a/deps/telepathy/telepathy-gabble/telepathy-gabble.url +++ b/deps/telepathy/telepathy-gabble/.url @@ -1 +1 @@ -http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.18.3.tar.gz +http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.18.4.tar.gz diff --git a/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild b/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild index 923c085..b2977cf 100755 --- a/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild +++ b/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL +# Copyright 2015, 2016, 2017 Eric Hameleers, Eindhoven, NL # Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -23,25 +23,24 @@ PKGNAM=telepathy-gabble -VERSION=${VERSION:-"0.18.3"} -BUILD=${BUILD:-3} +VERSION=${VERSION:-"0.18.4"} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" |