diff options
author | Eric Hameleers <alien@slackware.com> | 2013-02-13 15:10:32 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2013-02-13 15:10:32 +0000 |
commit | 0b4262e8bd006ca8b06808b62722f22eb2be7b6c (patch) | |
tree | d87ce6ad2a7352f82606e402ab13030cbc3da84b | |
parent | a6b326fbbbc5f1fefab080693a39fdac6d61b6b5 (diff) | |
download | asb-0b4262e8bd006ca8b06808b62722f22eb2be7b6c.tar.gz asb-0b4262e8bd006ca8b06808b62722f22eb2be7b6c.tar.xz |
Update to 3.99.5
-rwxr-xr-x | lame/build/lame.SlackBuild | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/lame/build/lame.SlackBuild b/lame/build/lame.SlackBuild index 989c1865..2356cfca 100755 --- a/lame/build/lame.SlackBuild +++ b/lame/build/lame.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2005-2010 Eric Hameleers, Eindhoven, NL +# Copyright 2005-2013 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -40,9 +40,11 @@ # * Rebuild. # 3.98.4-1: 02/jun/2010 by Eric Hameleers <alien@slackware.com> # * Updated. +# 3.99.5-1: 13/feb/2013 by Eric Hameleers <alien@slackware.com> +# * Updated. # # Run 'sh lame.SlackBuild' to build a Slackware package. -# The package (.tgz) plus descriptive .txt file are created in /tmp . +# The package (.txz) plus descriptive .txt file are created in /tmp . # Install using 'installpkg'. # # ----------------------------------------------------------------------------- @@ -73,12 +75,14 @@ SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${SRCVER}.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 @@ -89,11 +93,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 @@ -116,12 +128,13 @@ 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 -nv -T 30 -O "${SOURCE}" "${SRCURL}" || true + wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then echo "Downloading '$(basename ${SOURCE})' failed... aborting the build." mv -f "${SOURCE}" "${SOURCE}".FAIL @@ -170,9 +183,8 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-mp3rtp \ --program-prefix= \ --program-suffix= \ - --build=$ARCH-slackware-linux \ + --build=$TARGET \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log - # Spits errors now (was OK in 3.97): --enable-mp3rtp \ make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log # Install all the needed stuff to the package dir @@ -202,9 +214,9 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5 +md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5 cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt |