summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
author B. Watson <yalhcru@gmail.com>2016-08-19 04:59:20 -0400
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2016-08-20 07:50:03 +0700
commit4d65fcedcb912290ad44e8c22a6bbee005c0fa34 (patch)
tree41e2832f03b3dc8463dc1b800f51a89ba5e3d0d9 /audio
parent464113a1ab1629055c124fa1a905cc9e0728eaf9 (diff)
downloadslackbuilds-4d65fcedcb912290ad44e8c22a6bbee005c0fa34.tar.gz
slackbuilds-4d65fcedcb912290ad44e8c22a6bbee005c0fa34.tar.xz
audio/sonic-visualiser: i486 => i586.
Diffstat (limited to 'audio')
-rw-r--r--audio/sonic-visualiser/sonic-visualiser.SlackBuild20
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