diff options
Diffstat (limited to 'source/l/apr')
| -rwxr-xr-x | source/l/apr/apr.SlackBuild | 24 | ||||
| -rw-r--r-- | source/l/apr/apr.url | 4 | ||||
| -rw-r--r-- | source/l/apr/slack-desc | 6 |
3 files changed, 23 insertions, 11 deletions
diff --git a/source/l/apr/apr.SlackBuild b/source/l/apr/apr.SlackBuild index e9fdb3612..b43764b98 100755 --- a/source/l/apr/apr.SlackBuild +++ b/source/l/apr/apr.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) +PKGNAM=apr VERSION=${VERSION:-$(echo apr-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -34,6 +36,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i586" ]; then @@ -50,7 +60,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-apr @@ -60,7 +69,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf apr-$VERSION tar xvf $CWD/apr-$VERSION.tar.bz2 || exit 1 -cd apr-$VERSION +cd apr-$VERSION || exit 1 chown -R root:root . find . \ @@ -76,12 +85,15 @@ CFLAGS="$SLKCFLAGS" \ --with-installbuilddir=/usr/lib${LIBDIRSUFFIX}/apr-${VERSION}/build-1 \ --disable-static \ --with-devrandom=/dev/urandom \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make dox || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/l/apr/apr.url b/source/l/apr/apr.url index 9bb253929..2a3c19d10 100644 --- a/source/l/apr/apr.url +++ b/source/l/apr/apr.url @@ -1,2 +1,2 @@ -http://www.apache.org/dist/apr/apr-1.5.2.tar.bz2 -http://www.apache.org/dist/apr/apr-1.5.2.tar.bz2.asc +http://www.apache.org/dist/apr/apr-1.6.3.tar.bz2 +http://www.apache.org/dist/apr/apr-1.6.3.tar.bz2.asc diff --git a/source/l/apr/slack-desc b/source/l/apr/slack-desc index 2e52660d5..bc9236870 100644 --- a/source/l/apr/slack-desc +++ b/source/l/apr/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| |