diff options
Diffstat (limited to '')
-rw-r--r-- | deps/telepathy/telepathy-glib/.url (renamed from deps/telepathy/telepathy-glib/telepathy-glib.url) | 0 | ||||
-rwxr-xr-x | deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild | 19 |
2 files changed, 9 insertions, 10 deletions
diff --git a/deps/telepathy/telepathy-glib/telepathy-glib.url b/deps/telepathy/telepathy-glib/.url index 1c9d8f1..1c9d8f1 100644 --- a/deps/telepathy/telepathy-glib/telepathy-glib.url +++ b/deps/telepathy/telepathy-glib/.url diff --git a/deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild b/deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild index bfc748f..a176de3 100755 --- a/deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild +++ b/deps/telepathy/telepathy-glib/telepathy-glib.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. # @@ -24,24 +24,23 @@ PKGNAM=telepathy-glib VERSION=${VERSION:-"0.24.1"} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} 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" |