diff options
author | Christoph Willing <chris.willing@iinet.net.au> | 2017-03-12 08:01:47 +1000 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-03-18 06:59:15 +0700 |
commit | 50fb0d976482f3939e60ed6093d446d96e4e8725 (patch) | |
tree | e4af160045beee4448406ef4b8148ab567abdb4a | |
parent | cc9969b5a17a9b1b572ff154fc893e61b75e3cb9 (diff) |
graphics/Blender: Fix python path
Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>
-rw-r--r-- | graphics/Blender/Blender.SlackBuild | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild index 03be13ea991f..f49f2e7a9559 100644 --- a/graphics/Blender/Blender.SlackBuild +++ b/graphics/Blender/Blender.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for blender +# Slackware build script for Blender # Copyright 2015-2017 Christoph Willing Brisbane, Australia # All rights reserved. @@ -25,13 +25,14 @@ SRCNAM=blender PKGNAM=Blender VERSION=${VERSION:-2.78c} -BUILD=${BUILD:-1} +BASE_VERSION=${BASE_VERSION:-$( echo $VERSION | sed -e 's/[^0-9.]*//g')} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PYTHON_VERSION=$(python3 -c "import sys; print(sys.version[:3])") if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +43,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$SRCNAM 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" @@ -117,7 +118,7 @@ for bin in $BLENDERBINS ; do mv $PKG/usr/bin/$bin $PKG/usr/bin/$bin.bin cat <<EOF >$PKG/usr/bin/$bin #!/bin/sh -export PYTHONPATH=/usr/share/$SRCNAM/$VERSION/python/lib$LIBDIRSUFFIX/python$PYTHON_VERSION +export PYTHONPATH=/usr/share/$SRCNAM/$BASE_VERSION/python/lib$LIBDIRSUFFIX/python$PYTHON_VERSION export LD_LIBRARY_PATH=/usr/lib$LIBDIRSUFFIX/opencollada exec $bin.bin "\$@" EOF |