summaryrefslogtreecommitdiffstats
path: root/source/l/apr-util/apr-util.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/apr-util/apr-util.SlackBuild')
-rwxr-xr-xsource/l/apr-util/apr-util.SlackBuild40
1 files changed, 23 insertions, 17 deletions
diff --git a/source/l/apr-util/apr-util.SlackBuild b/source/l/apr-util/apr-util.SlackBuild
index 74fae2496..267c72ceb 100755
--- a/source/l/apr-util/apr-util.SlackBuild
+++ b/source/l/apr-util/apr-util.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 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-util
VERSION=${VERSION:-$(echo apr-util-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-7}
# 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-util
@@ -60,16 +69,10 @@ mkdir -p $TMP $PKG
cd $TMP
rm -rf apr-util-$VERSION
tar xvf $CWD/apr-util-$VERSION.tar.bz2 || exit 1
-cd apr-util-$VERSION
-
-# For now, this isn't working with svn (here, anyway) and is probably
-# more trouble than it's worth. Could be a grey area in regards to
-# licensing, too -- the Apache people say it's fine for third parties
-# to link this and distribute the result, but there are usually some
-# differing opinions when it comes to this sort of thing...
-#( cd dbd ; lftpget http://apache.webthing.com/svn/apache/apr/apr_dbd_mysql.c )
-# --with-mysql=/usr \
-#
+cd apr-util-$VERSION || exit 1
+
+# Fix issues using recent mariadb:
+zcat $CWD/apr-util-mariadb-upstream.patch.gz | patch -p1 --verbose || exit 1
chown -R root:root .
find . \
@@ -85,16 +88,19 @@ CFLAGS="$SLKCFLAGS" \
--with-apr=/usr \
--with-dbm=db44 \
--with-berkeley-db \
+ --with-mysql=/usr \
--disable-util-dso \
--without-gdbm \
--with-ldap \
- --disable-static \
--without-sqlite2 \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
make dox || exit 1
-make install DESTDIR=$PKG
+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