From 19c7db2aa07533dc2220c98e3a944c965df92016 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 3 Jul 2018 19:37:09 -0500
Subject: user/apr: pull in for apr-util

---
 user/apr/APKBUILD                          | 49 ++++++++++++++++++++++++++++++
 user/apr/apr-1.6.2-dont-test-dlclose.patch | 22 ++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 user/apr/APKBUILD
 create mode 100644 user/apr/apr-1.6.2-dont-test-dlclose.patch

(limited to 'user')

diff --git a/user/apr/APKBUILD b/user/apr/APKBUILD
new file mode 100644
index 000000000..433424068
--- /dev/null
+++ b/user/apr/APKBUILD
@@ -0,0 +1,49 @@
+# Maintainer: 
+pkgname=apr
+pkgver=1.6.3
+pkgrel=2
+pkgdesc="The Apache Portable Runtime"
+url="http://apr.apache.org/"
+arch="all"
+license="Apache-2.0"
+depends=""
+depends_dev="util-linux-dev bash"
+makedepends="$depends_dev"
+subpackages="$pkgname-dev"
+source="http://www.apache.org/dist/$pkgname/$pkgname-$pkgver.tar.bz2
+	apr-1.6.2-dont-test-dlclose.patch
+	"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--datadir=/usr/share \
+		--enable-nonportable-atomics \
+		--with-devrandom=/dev/urandom
+	make
+}
+
+check() {
+	cd "$builddir"
+	make -j1 check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+# APR is mostly a development package; only ship libraries in the default pkg.
+dev() {
+	depends="$pkgname $depends_dev"
+	mkdir -p "$subpkgdir"
+	mv "$pkgdir"/* "$subpkgdir"/
+	mkdir -p "$pkgdir"/usr/lib
+	mv "$subpkgdir"/usr/lib/*.so* "$pkgdir"/usr/lib/
+}
+
+sha512sums="f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996  apr-1.6.3.tar.bz2
+9fb931e45f30fbe68af56849dfca148c09cdf85e300af14fb259cbd43470113288680bdb21189d4cf13f5ce95f8d28666822535e017e64ace5324339ab50cbef  apr-1.6.2-dont-test-dlclose.patch"
diff --git a/user/apr/apr-1.6.2-dont-test-dlclose.patch b/user/apr/apr-1.6.2-dont-test-dlclose.patch
new file mode 100644
index 000000000..df2425404
--- /dev/null
+++ b/user/apr/apr-1.6.2-dont-test-dlclose.patch
@@ -0,0 +1,22 @@
+dlclose is a no-op on musl.  Test will always fail.
+
+--- apr-1.6.2/test/testdso.c.old	2010-01-03 19:35:07.000000000 -0600
++++ apr-1.6.2/test/testdso.c	2017-09-10 18:43:43.374983090 -0500
+@@ -244,7 +244,7 @@
+     abts_run_test(suite, test_load_module, NULL);
+     abts_run_test(suite, test_dso_sym, NULL);
+     abts_run_test(suite, test_dso_sym_return_value, NULL);
+-    abts_run_test(suite, test_unload_module, NULL);
++    /* abts_run_test(suite, test_unload_module, NULL); */
+ 
+ #ifdef LIB_NAME
+     apr_filepath_merge(&libname, NULL, LIB_NAME, 0, p);
+@@ -252,7 +252,7 @@
+     abts_run_test(suite, test_load_library, NULL);
+     abts_run_test(suite, test_dso_sym_library, NULL);
+     abts_run_test(suite, test_dso_sym_return_value_library, NULL);
+-    abts_run_test(suite, test_unload_library, NULL);
++    /* abts_run_test(suite, test_unload_library, NULL); */
+ #endif
+ 
+     abts_run_test(suite, test_load_notthere, NULL);
-- 
cgit v1.2.3-60-g2f50