From 1cf55e22cf5803c6bc342dd11ad8648b75617edf Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <ponce@slackbuilds.org>
Date: Sun, 27 Feb 2022 19:11:26 +0100
Subject: academic/gerbv: Fix for gcc >= 10.x.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 academic/gerbv/gerbv.SlackBuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/academic/gerbv/gerbv.SlackBuild b/academic/gerbv/gerbv.SlackBuild
index c0dd76976650..02666966c907 100644
--- a/academic/gerbv/gerbv.SlackBuild
+++ b/academic/gerbv/gerbv.SlackBuild
@@ -14,7 +14,7 @@ PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -32,8 +32,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"
@@ -61,7 +61,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-- 
cgit v1.2.3