diff options
| author |   Eric Hameleers <alien@slackware.com> | 2013-10-15 10:54:41 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2013-10-15 10:54:41 +0000 |
| commit | 04b9ba71979522d39a1ab458b0fa1230dd9a5669 (patch) | |
| tree | afe7e6d05a24c4b3d76d4b320fbaf17b2f804b69 /opencore-amr/build | |
| parent | 0b1291e93bc5e5774586faa33f0b454d7f7e738a (diff) | |
| download | asb-04b9ba71979522d39a1ab458b0fa1230dd9a5669.tar.gz asb-04b9ba71979522d39a1ab458b0fa1230dd9a5669.tar.xz | |
Update to 0.1.2
Diffstat (limited to 'opencore-amr/build')
| -rwxr-xr-x | opencore-amr/build/opencore-amr.SlackBuild | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/opencore-amr/build/opencore-amr.SlackBuild b/opencore-amr/build/opencore-amr.SlackBuild index 9645df80..ea89c50e 100755 --- a/opencore-amr/build/opencore-amr.SlackBuild +++ b/opencore-amr/build/opencore-amr.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2009,2010 Eric Hameleers, Eindhoven, NL +# Copyright (c) 2009, 2010, 2013 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -34,6 +34,8 @@ # * Initial build. # 0.1.2-2: 02/jun/2010 by Eric Hameleers <alien@slackware.com> # * Rebuilt for Slackware 13.1. +# 0.1.3-1: 15/oct/2013 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh opencore-amr.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -44,8 +46,8 @@ # Set initial variables: PRGNAM=opencore-amr -VERSION=${VERSION:-0.1.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.1.3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} @@ -67,12 +69,15 @@ SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${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 ;; + 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 @@ -83,9 +88,20 @@ case "$ARCH" in x86_64) SLKCFLAGS="-O2 -fPIC" SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" ;; - *) SLKCFLAGS="-O2" + armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; + armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + *) SLKCFLAGS=${SLKCFLAGS:-"O2"} + SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""} + ;; +esac + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; esac # Exit the script on errors: @@ -157,7 +173,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 |