diff options
| author |   Eric Hameleers <alien@slackware.com> | 2013-02-24 21:35:25 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2013-02-24 21:35:25 +0000 |
| commit | 3e8a62b822d8bce2f8fd680215e66801d1931ef1 (patch) | |
| tree | 89d0b28b83551fc1f43edc7d4478133530c9d561 /sshfs-fuse | |
| parent | 9c1eaae42cc3e5fd41d37e53ce8e684d77deeeb3 (diff) | |
| download | asb-3e8a62b822d8bce2f8fd680215e66801d1931ef1.tar.gz asb-3e8a62b822d8bce2f8fd680215e66801d1931ef1.tar.xz | |
Update to 2.4
Diffstat (limited to 'sshfs-fuse')
| -rwxr-xr-x | sshfs-fuse/build/sshfs-fuse.SlackBuild | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/sshfs-fuse/build/sshfs-fuse.SlackBuild b/sshfs-fuse/build/sshfs-fuse.SlackBuild index 8a16bb21..33cd3b5c 100755 --- a/sshfs-fuse/build/sshfs-fuse.SlackBuild +++ b/sshfs-fuse/build/sshfs-fuse.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2005, 2007, 2008, 2011 Eric Hameleers, Eindhoven, NL +# Copyright 2005, 2007, 2008, 2011, 2013 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -44,6 +44,8 @@ # * Rebuilt for Slackware 13.1. # 2.3-1: 11/aug/2011 by Eric Hameleers <alien@slackware.com> # * Update. +# 2.4-1: 24/feb/2013 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh sshfs-fuse.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -51,10 +53,8 @@ # # ----------------------------------------------------------------------------- -# Set initial variables: - PRGNAM=sshfs-fuse -VERSION=${VERSION:-2.3} +VERSION=${VERSION:-2.4} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} @@ -77,12 +77,14 @@ SRCURL="http://downloads.sourceforge.net/fuse/${PRGNAM}-${VERSION}.tar.gz" ## # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + 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=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -93,11 +95,19 @@ case "$ARCH" in x86_64) SLKCFLAGS="-O2 -fPIC" SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" ;; + armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; *) SLKCFLAGS="-O2" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; esac +case "ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + # Exit the script on errors: set -e trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR @@ -169,7 +179,7 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --program-prefix= \ --program-suffix= \ - --build=$ARCH-slackware-linux \ + --build=$TARGET \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log |