summaryrefslogtreecommitdiffstats
path: root/desktop
diff options
context:
space:
mode:
author Matteo Bernardini2022-02-10 20:56:53 +0100
committer Willy Sudiarto Raharjo2022-02-11 18:29:42 +0100
commit81333bf9ee9bb23b30d6ceabdf0d7376e2cde045 (patch)
treecc65ab6812de28acad5243ce7552ef73d1bfcd7b /desktop
parent82a4fb6f5063bbe861402a7e2ad25a82d8d87f0d (diff)
downloadslackbuilds-81333bf9ee9bb23b30d6ceabdf0d7376e2cde045.tar.gz
desktop/wmbackground: Fix for gcc >= 10.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/wmbackground/wmbackground.SlackBuild8
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/wmbackground/wmbackground.SlackBuild b/desktop/wmbackground/wmbackground.SlackBuild
index 2eb9ae3c19..9bf418386e 100644
--- a/desktop/wmbackground/wmbackground.SlackBuild
+++ b/desktop/wmbackground/wmbackground.SlackBuild
@@ -15,7 +15,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
@@ -33,8 +33,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"
@@ -64,7 +64,7 @@ find -L . \
cd wmbackground
make \
- CC="gcc -fgnu89-inline $SLKCFLAGS"
+ CC="gcc -fgnu89-inline $SLKCFLAGS -w -Wl,--allow-multiple-definition"
# Copy executable to the correct location
mkdir -p $PKG/usr/bin