diff options
author | Eric Hameleers <alien@slackware.com> | 2013-10-15 15:56:02 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2013-10-15 15:56:02 +0000 |
commit | c23948d75d008892f173164b984989fa6e6dabe1 (patch) | |
tree | f42dae80b35d6d1b2e5e8764243a97398adb37d2 /tinyproxy/build | |
parent | fa1d630563e922714690685b075de0599325a9da (diff) | |
download | asb-c23948d75d008892f173164b984989fa6e6dabe1.tar.gz asb-c23948d75d008892f173164b984989fa6e6dabe1.tar.xz |
Update to 1.8.3
Diffstat (limited to 'tinyproxy/build')
-rwxr-xr-x | tinyproxy/build/tinyproxy.SlackBuild | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/tinyproxy/build/tinyproxy.SlackBuild b/tinyproxy/build/tinyproxy.SlackBuild index 7c428cdd..1b199f73 100755 --- a/tinyproxy/build/tinyproxy.SlackBuild +++ b/tinyproxy/build/tinyproxy.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2008, 2010, 2011 Eric Hameleers, Eindhoven, NL +# Copyright 2008, 2010, 2011, 2013 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -40,6 +40,8 @@ # * Update. # 1.8.2-2: 08/aug/2010 by Eric Hameleers <alien@slackware.com> # * Rebuilt for Slackware 13.37. +# 1.8.3-1: 15/oct/2013 by Eric Hameleers <alien@slackware.com> +# * Updated for Slackware 14. # # Run 'sh tinyproxy.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -50,9 +52,9 @@ # Set initial variables: PRGNAM=tinyproxy -VERSION=${VERSION:-1.8.2} +VERSION=${VERSION:-1.8.3} MAJVER=$(echo $VERSION | cut -d. -f1-2) -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} @@ -76,12 +78,15 @@ SRCURL="https://banu.com/pub/${PRGNAM}/${MAJVER}/${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 ;; + 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 @@ -92,11 +97,22 @@ 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="" + ;; *) 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 @@ -119,10 +135,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 --no-check-certificate -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then @@ -172,7 +189,7 @@ CFLAGS="$SLKCFLAGS" \ --enable-transparent \ --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 |