2 files changed, 20 insertions, 4 deletions
diff --git a/source/l/apr/apr.SlackBuild b/source/l/apr/apr.SlackBuild
index 65098b06..2463b5a2 100755
--- a/source/l/apr/apr.SlackBuild
+++ b/source/l/apr/apr.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 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
@@ -62,6 +62,9 @@ rm -rf apr-$VERSION
 tar xvf $CWD/apr-$VERSION.tar.bz2 || exit 1
 cd apr-$VERSION
 
+# Patch to fix aliasing issue exposed by gcc-4.5.1:
+zcat $CWD/apr.apr_ring.h.gcc45.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,7 +79,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-installbuilddir=/usr/lib${LIBDIRSUFFIX}/apr-${VERSION}/build-1 \
   --disable-static \
   --with-devrandom=/dev/urandom \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
 make dox || exit 1
@@ -87,7 +90,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/apr-$VERSION
 cp -a \
-  LICENSE NOTICE README.dev \
+  LICENSE NOTICE README* \
   $PKG/usr/doc/apr-$VERSION
 
 # If there's a CHANGES file, installing at least part of the recent history
diff --git a/source/l/apr/apr.apr_ring.h.gcc45.diff b/source/l/apr/apr.apr_ring.h.gcc45.diff
new file mode 100644
index 00000000..c298cf4e
--- /dev/null
+++ b/source/l/apr/apr.apr_ring.h.gcc45.diff
@@ -0,0 +1,13 @@
+--- ./include/apr_ring.h.orig	2008-06-01 19:12:00.000000000 -0500
++++ ./include/apr_ring.h	2011-02-12 13:17:41.000000000 -0600
+@@ -90,8 +90,8 @@
+  */
+ #define APR_RING_HEAD(head, elem)					\
+     struct head {							\
+-	struct elem *next;						\
+-	struct elem *prev;						\
++	struct elem * volatile next;					\
++	struct elem * volatile prev;					\
+     }
+ 
+ /**