aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authordsomero <xgizzmo@gmail.com>2010-05-23 03:57:57 -0400
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-23 23:16:03 -0500
commit5ce2f052276fbfcad5db32e4d9a43fadef33a988 (patch)
treefc9d091cfaa4bd5c2133c7d3869d302336085860 /graphics
parenta31e0890fba8cbb9b795d9eafe2c1949618cd74c (diff)
graphics/FreeCAD: Miscellaneous cleanups and enable boost patch.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/FreeCAD/FreeCAD.SlackBuild16
1 files changed, 14 insertions, 2 deletions
diff --git a/graphics/FreeCAD/FreeCAD.SlackBuild b/graphics/FreeCAD/FreeCAD.SlackBuild
index a9c9ae9205296..fe520fba52aba 100644
--- a/graphics/FreeCAD/FreeCAD.SlackBuild
+++ b/graphics/FreeCAD/FreeCAD.SlackBuild
@@ -6,12 +6,21 @@
PRGNAM=FreeCAD
VERSION=0.9.2646
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
SRCVERSION=${VERSION}.5
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -26,6 +35,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e # Exit on most errors
@@ -41,7 +53,7 @@ chmod -R u+w,go+r-w,a-s .
# For newer boost versions (as in Slackware -current since 2009/12/17),
# correct names of libs (w/o -mt)
-#patch -p1 < $CWD/boost_current.patch
+patch -p1 < $CWD/boost_current.patch
./autogen.sh