diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-06-06 17:26:19 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-06-06 17:26:19 +0000 |
| commit | 360a6d14c9111a9e26a05d6abae7a092d4424ff9 (patch) | |
| tree | aad289933b3266c7a5bf3956d0092d709833bdaf /podofo | |
| parent | 28305e8fc3536a12e430964f2f1c84b66252162b (diff) | |
| download | asb-360a6d14c9111a9e26a05d6abae7a092d4424ff9.tar.gz asb-360a6d14c9111a9e26a05d6abae7a092d4424ff9.tar.xz | |
podofo: rebuilt for slackware-current
Diffstat (limited to 'podofo')
| -rwxr-xr-x | podofo/build/podofo.SlackBuild | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/podofo/build/podofo.SlackBuild b/podofo/build/podofo.SlackBuild index 9de3a9f5..c8efaca1 100755 --- a/podofo/build/podofo.SlackBuild +++ b/podofo/build/podofo.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2010, 2011, 2013, 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2010, 2011, 2013, 2017, 2018 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -38,6 +38,8 @@ # * Update. # 0.9.5-1: 16/jul/2017 by Eric Hameleers <alien@slackware.com> # * Update. +# 0.9.5-2: 06/jun/2018 by Eric Hameleers <alien@slackware.com> +# * Rebuilt for slackware-current. # # Run 'sh podofo.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -48,8 +50,8 @@ PRGNAM=podofo VERSION=${VERSION:-0.9.5} -BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:" -j4 "} +BUILD=${BUILD:-2} +NUMJOBS=${NUMJOBS:"-j$(nproc)"} TAG=${TAG:-alien} DOCS="AUTHORS ChangeLog CODING* CONTRIBUTIONS* COPYING* FAQ* \ @@ -71,17 +73,14 @@ 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 "$MARCH" in - i?86) export ARCH=i486 ;; - armv7hl) export ARCH=$MARCH ;; - armv6hl) export ARCH=$MARCH ;; - armv5hl) 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 @@ -94,12 +93,6 @@ case "$ARCH" in armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" LIBDIRSUFFIX="" ;; - armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" - LIBDIRSUFFIX="" - ;; - armv5hl) SLKCFLAGS="-O2 -mthumb -march=armv5te -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp" - LIBDIRSUFFIX="" - ;; *) SLKCFLAGS=${SLKCFLAGS:-"O2"} LIBDIRSUFFIX="" ;; |