diff options
Diffstat (limited to 'academic/convertall/convertall.SlackBuild')
| -rw-r--r-- | academic/convertall/convertall.SlackBuild | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/academic/convertall/convertall.SlackBuild b/academic/convertall/convertall.SlackBuild index 796ea42d07..fdb395cf6c 100644 --- a/academic/convertall/convertall.SlackBuild +++ b/academic/convertall/convertall.SlackBuild @@ -2,10 +2,12 @@ # # Slackware build script for convertall # -# Copyright 2012 John Berger <irgunii ampersand gmail . com>, TN, USA +# Copyright 2012-2021 John Berger <irgunii ampersand gmail . com>, TN, USA # I couldn't have made this script work without the help of -# Willy Sudiarto Raharjo <willysr@slackware-id.org>, so -# all thanks go to him. +# Willy Sudiarto Raharjo <willysr@slackware-id.org>, so big thanks to him. +# Also a big thank you to Kevin McCormick for helping with a python 3 +# problem I'd missed. +# # # All rights reserved. # @@ -28,13 +30,13 @@ PRGNAM=convertall SRCNAM=ConvertAll -VERSION=${VERSION:-0.5.2} +VERSION=${VERSION:-0.8.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 @@ -45,8 +47,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" @@ -77,7 +79,7 @@ find -L . \ # Change installation directory to /usr and use LIBDIRSUFFIX sed -i -e "s/usr\/local/usr/" -e "s/'lib'/'lib$LIBDIRSUFFIX'/" install.py -python install.py -b $PKG +python3 install.py -b $PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true |