diff options
| author |   Matteo Bernardini | 2022-02-27 19:11:26 +0100 |
|---|---|---|
| committer |   Robby Workman | 2022-02-28 05:29:05 +0100 |
| commit | 1cf55e22cf5803c6bc342dd11ad8648b75617edf (patch) | |
| tree | f46f4fd9106d0fa2d67329bde59f780cbde04bc6 /academic/gerbv | |
| parent | 127ca8ad0e548345f375404541bf8e3e41e788f5 (diff) | |
| download | slackbuilds-1cf55e22cf5803c6bc342dd11ad8648b75617edf.tar.gz | |
academic/gerbv: Fix for gcc >= 10.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'academic/gerbv')
| -rw-r--r-- | academic/gerbv/gerbv.SlackBuild | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/academic/gerbv/gerbv.SlackBuild b/academic/gerbv/gerbv.SlackBuild index c0dd769766..02666966c9 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 \ |