diff options
| author |   Eric Hameleers <alien@slackware.com> | 2013-10-15 12:48:58 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2013-10-15 12:48:58 +0000 |
| commit | 73103ceb36d75a6f177aa4a758279b7e90a19bf2 (patch) | |
| tree | 5025a5c26cbc74174574f56b04b422fe8f9cb011 /mod_authnz_external | |
| parent | b9ccd68420bf61eff8b38c83451c73fc593d38d2 (diff) | |
| download | asb-73103ceb36d75a6f177aa4a758279b7e90a19bf2.tar.gz asb-73103ceb36d75a6f177aa4a758279b7e90a19bf2.tar.xz | |
Update to 3.3.1
Diffstat (limited to 'mod_authnz_external')
| -rwxr-xr-x | mod_authnz_external/build/mod_authnz_external.SlackBuild | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/mod_authnz_external/build/mod_authnz_external.SlackBuild b/mod_authnz_external/build/mod_authnz_external.SlackBuild index 278c9215..574ac1e0 100755 --- a/mod_authnz_external/build/mod_authnz_external.SlackBuild +++ b/mod_authnz_external/build/mod_authnz_external.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2010 Eric Hameleers, Eindhoven, NL +# Copyright 2010, 2013 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -32,6 +32,8 @@ # Changelog: # 3.2.5-1: 12/Nov/2010 by Eric Hameleers <alien@slackware.com> # * Initial build. +# 3.3.1-1: 15/oct/2013 by Eric Hameleers <alien@slackware.com> +# * Update (also with newer pwauth). # # Run 'sh mod_authnz_external.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -42,8 +44,8 @@ # Set initial variables: PRGNAM=mod_authnz_external -VERSION=${VERSION:-3.2.5} -PWAUTH=${PWAUTH:-2.3.8} +VERSION=${VERSION:-3.3.1} +PWAUTH=${PWAUTH:-2.3.10} BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -72,12 +74,15 @@ SRCURL[1]="http://pwauth.googlecode.com/files/pwauth-${PWAUTH}.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 ;; + 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 @@ -88,6 +93,12 @@ 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="" ;; @@ -161,6 +172,12 @@ chmod -R u+w,go+r-w,a+X-s * cd ${PRGNAM}-${VERSION} +# A patch is required to compile against apache 2.4: +if [ -n "$(/usr/sbin/apachectl -v | grep Apache/2.4)" ]; then + cat $SRCDIR/mod_authnz_external_apache-2.4.patch | patch -p1 --verbose \ + 2>&1 | tee $OUTPUT/patch-%{PRGNAM}.log +fi + echo Building ... export LDFLAGS="$SLKLDFLAGS" export CXXFLAGS="$SLKCFLAGS" |