summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Bernardini <ponce@slackbuilds.org>2022-02-10 21:10:51 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-12 00:29:43 +0700
commit7d561a6d7809f570ad70ed13d8d44e008c4e1393 (patch)
treec8e2f4ba0d53e5a4e0878ffd31e19c517eb2e69b
parenta4483b4930d69a7af282b4b581072e60ddb4640c (diff)
downloadslackbuilds-7d561a6d7809f570ad70ed13d8d44e008c4e1393.tar.gz
desktop/wmphoto+: Fix for gcc >= 10.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--desktop/wmphoto+/wmphoto+.SlackBuild8
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/wmphoto+/wmphoto+.SlackBuild b/desktop/wmphoto+/wmphoto+.SlackBuild
index 7df2ed25ae..cbb64b2812 100644
--- a/desktop/wmphoto+/wmphoto+.SlackBuild
+++ b/desktop/wmphoto+/wmphoto+.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 wmphoto
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