diff options
| -rw-r--r-- | audio/sonic-visualiser/sonic-visualiser.SlackBuild | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/audio/sonic-visualiser/sonic-visualiser.SlackBuild b/audio/sonic-visualiser/sonic-visualiser.SlackBuild index 002743ceb0..098b5a0cad 100644 --- a/audio/sonic-visualiser/sonic-visualiser.SlackBuild +++ b/audio/sonic-visualiser/sonic-visualiser.SlackBuild @@ -6,6 +6,9 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20160819 bkw: +# - parallel build is still broken, revert to -j1 + # 20160806 bkw: # - updated to 2.5, which means adding a qt5 dep. # - fix parallel build. @@ -27,7 +30,7 @@ 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 @@ -38,8 +41,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" @@ -79,13 +82,12 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux -# parallel build fails from main Makefile, used to have to do this: -#make -j1 +# this almost allows parallel make to succeed... +#make -C svcore +#make -# ...but forcing libsvcore.a to be built first, allows parallel make -# to succeed. -make -C svcore -make +# parallel build fails, I still want to fix it, but for now... +make -j1 # There is no 'make install', stick everything where it goes: mkdir -p $PKG/usr/share/$PRGNAM/samples $PKG/usr/bin |