summaryrefslogtreecommitdiff
path: root/libraries/collada-dom/collada-dom.SlackBuild
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-07-06 08:20:31 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-07-06 08:21:11 +0700
commit8ac8893a4d2851c6db0f966a252f2c8f4b3d94fa (patch)
treeaee88e4e430aee6883583da15bac2577ca11d2d4 /libraries/collada-dom/collada-dom.SlackBuild
parent2fdf317e1d9f6392c69bd6aad71ca42467bcada5 (diff)
downloadslackbuilds-8ac8893a4d2851c6db0f966a252f2c8f4b3d94fa.tar.gz
libraries/collada-dom: Fix build on -current.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/collada-dom/collada-dom.SlackBuild')
-rw-r--r--libraries/collada-dom/collada-dom.SlackBuild8
1 files changed, 5 insertions, 3 deletions
diff --git a/libraries/collada-dom/collada-dom.SlackBuild b/libraries/collada-dom/collada-dom.SlackBuild
index 35bcef7435..6703558450 100644
--- a/libraries/collada-dom/collada-dom.SlackBuild
+++ b/libraries/collada-dom/collada-dom.SlackBuild
@@ -15,7 +15,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
@@ -26,8 +26,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"
@@ -55,6 +55,8 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+patch -p1 < $CWD/return-type.patch
+
mkdir -p build
cd build
cmake \