diff options
author | Eric Hameleers <alien@slackware.com> | 2012-08-08 12:15:39 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2012-08-08 12:15:39 +0000 |
commit | 41e8fc91c6b27a655993ce7304aa7524151f07d5 (patch) | |
tree | 931ea98bb37e02347dd52eb9bdb10db2f220aa9a /lensfun/build | |
parent | bb9283959ec0c6af16c70236f070294ac957bb60 (diff) | |
download | asb-41e8fc91c6b27a655993ce7304aa7524151f07d5.tar.gz asb-41e8fc91c6b27a655993ce7304aa7524151f07d5.tar.xz |
Update to 0.2.6
Diffstat (limited to 'lensfun/build')
-rwxr-xr-x | lensfun/build/lensfun.SlackBuild | 41 |
1 files changed, 31 insertions, 10 deletions
diff --git a/lensfun/build/lensfun.SlackBuild b/lensfun/build/lensfun.SlackBuild index 6e32fe9c..95eeed66 100755 --- a/lensfun/build/lensfun.SlackBuild +++ b/lensfun/build/lensfun.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2009, 2010 Eric Hameleers, Eindhoven, NL +# Copyright 2009, 2010, 2012 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -34,6 +34,8 @@ # * Initial build. # 0.2.5-1: 14/jun/2010 by Eric Hameleers <alien@slackware.com> # * Long overdue update. +# 0.2.6-1: 08/aug/2012 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh lensfun.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -44,12 +46,12 @@ # Set initial variables: PRGNAM=lensfun -VERSION=${VERSION:-0.2.5} +VERSION=${VERSION:-0.2.6} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} -DOCS="README docs/gpl-3.0.txt" +DOCS="README docs/*.txt" # Where do we look for sources? SRCDIR=$(cd $(dirname $0); pwd) @@ -67,12 +69,16 @@ SRCURL="http://download.berlios.de/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2" ## # 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 ;; + armv6hl) export ARCH=$MARCH ;; + armv5hl) 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 @@ -83,11 +89,25 @@ 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="" + ;; + armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + armv5hl) SLKCFLAGS="-O2 -mthumb -march=armv5te -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp" + 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 @@ -110,10 +130,11 @@ rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log # Source file availability: if ! [ -f ${SOURCE} ]; then + echo "Source '$(basename ${SOURCE})' not available yet..." + # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT + [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" + if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi if ! [ "x${SRCURL}" == "x" ]; then - # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT - [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" - echo "Source '$(basename ${SOURCE})' not available yet..." echo "Will download file to $(dirname $SOURCE)" wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then |