2 files changed, 20 insertions, 18 deletions
diff --git a/development/extra-cmake-modules/extra-cmake-modules.SlackBuild b/development/extra-cmake-modules/extra-cmake-modules.SlackBuild
index 2a0db1114a..17a4788b6d 100644
--- a/development/extra-cmake-modules/extra-cmake-modules.SlackBuild
+++ b/development/extra-cmake-modules/extra-cmake-modules.SlackBuild
@@ -25,17 +25,16 @@
 # Adapted by Fellype do Nascimento - fellype(at)gmail.com
 
 PRGNAM=extra-cmake-modules
-VERSION=${VERSION:-5.31.0}
+VERSION=${VERSION:-5.34.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
-  case "$(uname -m)" in
+  case "$( uname -m )" in
     i?86) ARCH=i586 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
-    *) ARCH=$(uname -m) ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
   esac
-  export ARCH
 fi
 
 CWD=$(pwd)
@@ -43,24 +42,27 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -m32 -march=i586 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG
+mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -76,9 +78,9 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DMAN_INSTALL_DIR=/usr/man \
-    ..
-    make
-   make install DESTDIR=$PKG
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
 cd -
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/development/extra-cmake-modules/extra-cmake-modules.info b/development/extra-cmake-modules/extra-cmake-modules.info
index ae0c27bd0b..9d79c41d89 100644
--- a/development/extra-cmake-modules/extra-cmake-modules.info
+++ b/development/extra-cmake-modules/extra-cmake-modules.info
@@ -1,8 +1,8 @@
 PRGNAM="extra-cmake-modules"
-VERSION="5.31.0"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
-DOWNLOAD="http://download.kde.org/stable/frameworks/5.31/extra-cmake-modules-5.31.0.tar.xz"
-MD5SUM="74d7c29138168f9a62fe475705c0b351"
+VERSION="5.34.0"
+HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
+DOWNLOAD="https://github.com/KDE/extra-cmake-modules/archive/v5.34.0/extra-cmake-modules-5.34.0.tar.gz"
+MD5SUM="dab0e5b7bc002b8d84bbe39bd2bc189b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Sphinx"