diff options
author | Eric Hameleers <alien@slackware.com> | 2013-07-01 21:30:01 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2013-07-01 21:30:01 +0000 |
commit | c2a20b87872fc23fcf4c65fc27321597c77c3bc9 (patch) | |
tree | a6e33e47cad47dc9fcc6793cc285e1bd71ad8c48 | |
parent | 349d1c82935a19b5dfbc7a4dd166137a12d65729 (diff) | |
download | asb-c2a20b87872fc23fcf4c65fc27321597c77c3bc9.tar.gz asb-c2a20b87872fc23fcf4c65fc27321597c77c3bc9.tar.xz |
Updated to 3.4
-rwxr-xr-x | mod_wsgi/build/mod_wsgi.SlackBuild | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/mod_wsgi/build/mod_wsgi.SlackBuild b/mod_wsgi/build/mod_wsgi.SlackBuild index d889c48d..ead1846f 100755 --- a/mod_wsgi/build/mod_wsgi.SlackBuild +++ b/mod_wsgi/build/mod_wsgi.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2011 Eric Hameleers, Eindhoven, NL +# Copyright 2011, 2013 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -32,6 +32,8 @@ # Changelog: # 3.3-1: 31/Jul/2011 by Eric Hameleers <alien@slackware.com> # * Initial build. +# 3.4-1: 01/jul/2013 by Eric Hameleers <alien@slackware.com> +# * Upgraded for Slackware 14. # # Run 'sh mod_wsgi.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -39,10 +41,8 @@ # # ----------------------------------------------------------------------------- -# Set initial variables: - PRGNAM=mod_wsgi -VERSION=${VERSION:-3.3} +VERSION=${VERSION:-3.4} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} @@ -57,7 +57,6 @@ TMP=${TMP:-/tmp/build} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# Input URL: http://modwsgi.googlecode.com/files/mod_wsgi-3.3.tar.gz SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz" SRCURL="http://modwsgi.googlecode.com/files/${PRGNAM}-${VERSION}.tar.gz" @@ -66,12 +65,14 @@ SRCURL="http://modwsgi.googlecode.com/files/${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 @@ -82,11 +83,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 @@ -158,7 +167,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 |