diff options
| -rw-r--r-- | libraries/xulrunner/README | 11 | ||||
| -rw-r--r-- | libraries/xulrunner/xulrunner.SlackBuild | 14 |
2 files changed, 15 insertions, 10 deletions
diff --git a/libraries/xulrunner/README b/libraries/xulrunner/README index 8c21e3d8ab..aa858c56b2 100644 --- a/libraries/xulrunner/README +++ b/libraries/xulrunner/README @@ -5,17 +5,10 @@ and uninstalling these applications. XULRunner will also provide libxul, a solution which allows the embedding of Mozilla technologies in other projects and products. -Requirers jdk from /extra in Slackware. +This requires jdk from /extra in Slackware. Note: If you have to install jdk you need to run ". /etc/profile" before trying to compile xurlrunner. -Some of the optional dependences are: - -GConf -ORBit2 -avahi -gnome-vfs -libbonobo -libgnome +Optional dependencies are GConf, avahi, gnome-vfs, libbonobo, and libgnome. diff --git a/libraries/xulrunner/xulrunner.SlackBuild b/libraries/xulrunner/xulrunner.SlackBuild index b2804af6e4..1d5cae46d8 100644 --- a/libraries/xulrunner/xulrunner.SlackBuild +++ b/libraries/xulrunner/xulrunner.SlackBuild @@ -29,10 +29,19 @@ PRGNAM=xulrunner VERSION=${VERSION:-1.9.1.7} -ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +# 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 @@ -47,6 +56,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e |