diff options
| -rw-r--r-- | libraries/fox-toolkit/FXint-no_inline.diff | 20 | ||||
| -rw-r--r-- | libraries/fox-toolkit/fox-toolkit.SlackBuild | 16 |
2 files changed, 11 insertions, 25 deletions
diff --git a/libraries/fox-toolkit/FXint-no_inline.diff b/libraries/fox-toolkit/FXint-no_inline.diff deleted file mode 100644 index a5c8b02cda..0000000000 --- a/libraries/fox-toolkit/FXint-no_inline.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- xfe-1.32.1_orig/src/xfeutils.cpp 2009-11-09 14:17:17.000000000 -0200 -+++ xfe-1.32.1/src/xfeutils.cpp 2010-02-17 00:39:22.000000000 -0200 -@@ -512,7 +512,7 @@ - - - // Replacement of the stat function --inline FXint statrep(const FXchar* filename, struct stat* buf) -+FXint statrep(const FXchar* filename, struct stat* buf) - { - #if defined(linux) - -@@ -546,7 +546,7 @@ - - - // Replacement of the lstat function --inline FXint lstatrep(const FXchar* filename, struct stat* buf) -+FXint lstatrep(const FXchar* filename, struct stat* buf) - { - #if defined(linux) - diff --git a/libraries/fox-toolkit/fox-toolkit.SlackBuild b/libraries/fox-toolkit/fox-toolkit.SlackBuild index 9c6f5dd6e3..a665afd5f7 100644 --- a/libraries/fox-toolkit/fox-toolkit.SlackBuild +++ b/libraries/fox-toolkit/fox-toolkit.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for fox-toolkit -# Copyright 2006-2010 Robby Workman, Northport, AL, USA +# Copyright 2006,2007,2008,2009,2010 Robby Workman, Northport, AL, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,10 +24,19 @@ PRGNAM=fox-toolkit VERSION=1.6.37 -ARCH=${ARCH:-i486} BUILD=${BUILD:-2} 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 @@ -75,9 +84,6 @@ if [ "$OPENGL" = "YES" ]; then do_opengl="no" fi -# Uncomment this line to build on -current -#patch -p1 < $CWD/FXint-no_inline.diff - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |