summaryrefslogtreecommitdiff
path: root/source/l/apr
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/apr')
-rwxr-xr-xsource/l/apr/apr.SlackBuild5
-rw-r--r--source/l/apr/apr.apr_ring.h.gcc45.diff13
-rw-r--r--source/l/apr/apr.url2
3 files changed, 3 insertions, 17 deletions
diff --git a/source/l/apr/apr.SlackBuild b/source/l/apr/apr.SlackBuild
index 2463b5a2..193f602b 100755
--- a/source/l/apr/apr.SlackBuild
+++ b/source/l/apr/apr.SlackBuild
@@ -22,7 +22,7 @@
VERSION=${VERSION:-$(echo apr-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -62,9 +62,6 @@ 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 \) \
diff --git a/source/l/apr/apr.apr_ring.h.gcc45.diff b/source/l/apr/apr.apr_ring.h.gcc45.diff
deleted file mode 100644
index c298cf4e..00000000
--- a/source/l/apr/apr.apr_ring.h.gcc45.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./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; \
- }
-
- /**
diff --git a/source/l/apr/apr.url b/source/l/apr/apr.url
new file mode 100644
index 00000000..1ff6c677
--- /dev/null
+++ b/source/l/apr/apr.url
@@ -0,0 +1,2 @@
+http://www.apache.org/dist/apr/apr-1.4.6.tar.bz2
+http://www.apache.org/dist/apr/apr-1.4.6.tar.bz2.asc