diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-07-27 09:42:05 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-07-27 09:42:05 +0000 |
| commit | 1739d10a37f8729278ffc0fd15cc80dad32ebbaa (patch) | |
| tree | 048d0ca75785f3f3f4273676d8c4033cdc0ea56f /calibre | |
| parent | 5ee20f4375d90ab73be952c9bf2052dfc8a813fd (diff) | |
| download | asb-1739d10a37f8729278ffc0fd15cc80dad32ebbaa.tar.gz asb-1739d10a37f8729278ffc0fd15cc80dad32ebbaa.tar.xz | |
Update to 0.8.62
Diffstat (limited to 'calibre')
| -rwxr-xr-x | calibre/build/calibre.SlackBuild | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild index 36fd302c..2cb81e47 100755 --- a/calibre/build/calibre.SlackBuild +++ b/calibre/build/calibre.SlackBuild @@ -152,6 +152,10 @@ # * New release. # 0.8.59-1: 06/jul/2012 by Eric Hameleers <alien@slackware.com> # * New release. +# 0.8.61-1: 25/jul/2012 by Eric Hameleers <alien@slackware.com> +# * New release. +# 0.8.62-1: 27/jul/2012 by Eric Hameleers <alien@slackware.com> +# * New release. # # Run 'sh calibre.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -162,7 +166,7 @@ # Set initial variables: PRGNAM=calibre -VERSION=${VERSION:-0.8.59} +VERSION=${VERSION:-0.8.62} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} @@ -258,12 +262,14 @@ fi ## # 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 @@ -274,6 +280,9 @@ 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="" ;; |