diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-04-22 09:48:15 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-04-22 09:48:15 +0000 |
| commit | 05654c4da176c3e0436740337e24b285940b3a75 (patch) | |
| tree | 1ee2bb12a402f32094c4f61c8a351f23af3838b0 /lua/build | |
| parent | 46d0dc5b6fd024fdeb233e8b2979be5bd14565a9 (diff) | |
| download | asb-05654c4da176c3e0436740337e24b285940b3a75.tar.gz asb-05654c4da176c3e0436740337e24b285940b3a75.tar.xz | |
lua: rebuilt after boost upgrade in -current
Diffstat (limited to 'lua/build')
| -rwxr-xr-x | lua/build/lua.SlackBuild | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lua/build/lua.SlackBuild b/lua/build/lua.SlackBuild index bd184c37..155fb0c2 100755 --- a/lua/build/lua.SlackBuild +++ b/lua/build/lua.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2009, 2011, 2013, 2015 Eric Hameleers, Eindhoven, NL +# Copyright 2009, 2011, 2013, 2015, 2018 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -46,6 +46,8 @@ # - Modified by the SlackBuilds.org project # - Modified by Aaron W. Hsu # - Updated by Matteo Bernardini +# 5.1.5-3: 22/apr/2018 by Eric Hameleers <alien@slackware.com> +# * Rebuilt for -current after boost upgrade. # # Run 'sh lua.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -56,8 +58,8 @@ PRGNAM=lua VERSION=${VERSION:-5.1.5} -BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:" -j4 "} +BUILD=${BUILD:-3} +NUMJOBS=${NUMJOBS:" -j7 "} TAG=${TAG:-alien} DOCS="COPYRIGHT HISTORY INSTALL README \ @@ -79,20 +81,18 @@ SRCURL[0]="http://www.lua.org/ftp/${PRGNAM}-${VERSION}.tar.gz" ## # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - armv7hl) export ARCH=$MARCH ;; - armv6hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i?86) SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; x86_64) SLKCFLAGS="-O2 -fPIC" |