From c92ee29b17ad2239ce11ddd76134b199ef5a3ed2 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 30 Jan 2021 16:23:40 +0100 Subject: 20210130.1 global branch merge. Signed-off-by: Matteo Bernardini --- development/openocd/openocd.SlackBuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'development/openocd/openocd.SlackBuild') diff --git a/development/openocd/openocd.SlackBuild b/development/openocd/openocd.SlackBuild index c75a62622a..e34954da41 100644 --- a/development/openocd/openocd.SlackBuild +++ b/development/openocd/openocd.SlackBuild @@ -5,13 +5,13 @@ # Written by thorsten johannvorderbrueggen PRGNAM=openocd -VERSION=${VERSION:-0.8.0} +VERSION=${VERSION:-0.10.0} 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 @@ -22,8 +22,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" @@ -51,7 +51,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=implicit-fallthrough= -Wno-error=format-truncation= -Wno-error=format-overflow=" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ -- cgit v1.2.3