diff options
| author | Petar Petrov <slackalaxy@gmail.com> | 2021-05-18 15:38:29 +0300 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2021-05-18 23:40:05 +0700 |
| commit | d18e370e2fd23d3143e4ffec15460efe1e3b55c0 (patch) | |
| tree | 1054982c981dab1549bac63f8d9066d6b0b060f4 | |
| parent | 89ca84bb77b65f540413a68e19b909ed8995a396 (diff) | |
academic/arka: fix build + misc cleanups
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | academic/arka/arka.SlackBuild | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/academic/arka/arka.SlackBuild b/academic/arka/arka.SlackBuild index eea4b48a41d0..5ab90c8fd4ee 100644 --- a/academic/arka/arka.SlackBuild +++ b/academic/arka/arka.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for arka -# Copyright 2011-2016 Petar Petrov slackalaxy@gmail.com +# Copyright 2011-2021 Petar Petrov slackalaxy@gmail.com # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,12 +24,12 @@ PRGNAM=arka VERSION=${VERSION:-0.11} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} 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 @@ -40,8 +40,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" @@ -62,14 +62,16 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tgz cd $PRGNAM-$VERSION + # Remove the pre-existing binary, just in case rm arka + chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # A few path fixes to the Makefile, although it will work anyways. sed "s:/usr/X11R6/bin:/usr/bin:" -i Makefile @@ -81,8 +83,8 @@ sed "s:/usr/X11R6/include/X11/pixmaps:/usr/share/pixmaps:" -i Makefile sed -i "/^CFLAGS/s/=/+=/" src/Makefile # Fix for gcc-5.2.0 linker errors: add -fgnu89-inline -CFLAGS="$SLKCFLAGS -fgnu89-inline" \ -CXXFLAGS="$SLKCFLAGS -fgnu89-inline" \ +CFLAGS="$SLKCFLAGS -fgnu89-inline -fcommon" \ +CXXFLAGS="$SLKCFLAGS -fgnu89-inline -fcommon" \ make # The Makefile does not support "make DESTDIR install". So... |