From 0c6fe367a7009c5bbabc3071f8cccc77a37859eb Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sun, 12 Jan 2020 12:08:26 +0100
Subject: 20200112.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 libraries/lablgtk/lablgtk.SlackBuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'libraries/lablgtk/lablgtk.SlackBuild')

diff --git a/libraries/lablgtk/lablgtk.SlackBuild b/libraries/lablgtk/lablgtk.SlackBuild
index 5cb0a33e18..563eda8643 100644
--- a/libraries/lablgtk/lablgtk.SlackBuild
+++ b/libraries/lablgtk/lablgtk.SlackBuild
@@ -24,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lablgtk
-VERSION=${VERSION:-2.18.4}
+VERSION=${VERSION:-2.18.8}
 BUILD=${BUILD:-1}
 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
@@ -41,8 +41,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"
@@ -82,7 +82,7 @@ make -j1 world
 make DESTDIR=$PKG install
 
 # remove file conflicting with ocaml's ones
-rm -f $PKG/usr/lib$LIBDIRSUFFIX/ocaml/ld.conf
+rm $PKG/usr/lib$LIBDIRSUFFIX/ocaml/ld.conf || exit 1
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-- 
cgit v1.2.3