diff options
Diffstat (limited to 'source.local/x/x11-skel/x11-skel.SlackBuild')
| -rwxr-xr-x | source.local/x/x11-skel/x11-skel.SlackBuild | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/source.local/x/x11-skel/x11-skel.SlackBuild b/source.local/x/x11-skel/x11-skel.SlackBuild index aa808eb..2922de9 100755 --- a/source.local/x/x11-skel/x11-skel.SlackBuild +++ b/source.local/x/x11-skel/x11-skel.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,28 +20,32 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port. +# Modified 2013 by Eric Hameleers <alien at slackware.com> for ARM port. -VERSION=7.4 -BUILD=${BUILD:-2} +VERSION=7.7 +BUILD=${BUILD:-1} -# Automatically determine the architecture we're building on: -MARCH=$( uname -m ) -if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac -fi - -if [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" +if [ -e $CWD/machine.conf ]; then + . $CWD/machine.conf ] +elif [ -e /etc/slackbuild/machine.conf ]; then + . /etc/slackbuild/machine.conf ] else - LIBDIRSUFFIX="" + # 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 + # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: + if [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="64" + else + LIBDIRSUFFIX="" + fi fi CWD=$(pwd) |