From efc2d632e715498adf632904e2425a5d89e1e44f Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Fri, 22 Dec 2017 00:32:25 +0100
Subject: deps/telepathy: updates and recompilations

---
 .../telepathy-morse/telepathy-morse.SlackBuild        | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'deps/telepathy/telepathy-morse/telepathy-morse.SlackBuild')

diff --git a/deps/telepathy/telepathy-morse/telepathy-morse.SlackBuild b/deps/telepathy/telepathy-morse/telepathy-morse.SlackBuild
index 440e858..8e4d234 100755
--- a/deps/telepathy/telepathy-morse/telepathy-morse.SlackBuild
+++ b/deps/telepathy/telepathy-morse/telepathy-morse.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2016  Eric Hameleers, Eindhoven, NL
+# Copyright 2016, 2017  Eric Hameleers, Eindhoven, NL
 # Copyright 2016  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -24,24 +24,23 @@
 
 PKGNAM=telepathy-morse
 VERSION=${VERSION:-"9429155_20161107git"}
-BUILD=${BUILD:-1}
+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"
-- 
cgit v1.2.3