aboutsummaryrefslogtreecommitdiffstats
path: root/main/apr-util
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-10-04 14:08:12 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-10-04 14:08:12 +0000
commit0e62852519eb49144b33213289fac2afcfe964ae (patch)
tree2509444319fabc2002bf4b9455639c8dae010f3b /main/apr-util
parent85ed9b9df1975852396ffad810566787f1decdf8 (diff)
downloadaports-0e62852519eb49144b33213289fac2afcfe964ae.tar.bz2
aports-0e62852519eb49144b33213289fac2afcfe964ae.tar.xz
main/apr-util: modernize, enable tests
Diffstat (limited to 'main/apr-util')
-rw-r--r--main/apr-util/APKBUILD25
-rw-r--r--main/apr-util/musl-fix-testsuite.patch19
2 files changed, 34 insertions, 10 deletions
diff --git a/main/apr-util/APKBUILD b/main/apr-util/APKBUILD
index 98d72700f2..d85a28b5c7 100644
--- a/main/apr-util/APKBUILD
+++ b/main/apr-util/APKBUILD
@@ -13,7 +13,8 @@ subpackages="$pkgname-dev $pkgname-dbm_db $pkgname-dbd_pgsql $pkgname-dbd_mysql
depends_dev="expat-dev apr-dev openldap-dev sqlite-dev postgresql-dev
db-dev libressl-dev mariadb-dev"
makedepends="$depends_dev bash chrpath libressl"
-source="http://www.apache.org/dist/apr/$pkgname-$pkgver.tar.bz2"
+source="http://www.apache.org/dist/apr/$pkgname-$pkgver.tar.bz2
+ musl-fix-testsuite.patch"
builddir="$srcdir/$pkgname-$pkgver"
build() {
@@ -25,29 +26,32 @@ build() {
--with-apr=/usr \
--with-ldap \
--with-pgsql \
- --with-mysql \
+ --with-mysql \
--with-sqlite3 \
--with-berkeley-db \
--with-crypto \
--with-openssl \
--without-sqlite2 \
- --without-gdbm \
- || return 1
- make || return 1
+ --without-gdbm
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
}
package() {
cd "$builddir"
- make DESTDIR="$pkgdir" install || return 1
- rm "$pkgdir"/usr/lib/*.exp || return 1
- chrpath -d "$pkgdir"/usr/lib/*.so.* || return 1
+ make DESTDIR="$pkgdir" install
+ rm "$pkgdir"/usr/lib/*.exp
+ chrpath -d "$pkgdir"/usr/lib/*.so.*
}
_mv_mod() {
pkgdesc="The Apache Portable Runtime Utility Library - $2 driver"
depends=
local _moddir="usr/lib/apr-util-1"
- ls "$pkgdir"/$_moddir
mkdir -p "$subpkgdir"/$_moddir
mv "$pkgdir"/$_moddir/apr_$1*.so "$subpkgdir"/$_moddir/
}
@@ -58,4 +62,5 @@ dbd_mysql() { _mv_mod dbd_mysql "MySQL"; }
dbd_sqlite3() { _mv_mod dbd_sqlite "SQLite3"; }
ldap() { _mv_mod ldap "LDAP"; }
-sha512sums="40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d apr-util-1.6.1.tar.bz2"
+sha512sums="40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d apr-util-1.6.1.tar.bz2
+4672c55bbe78a401483dd21f29dd1f92d70887191f3d4945a616223c18e39e051609a3b52a5547a9dbcc54e315cf5866e5dfb5ef9507c3914e9d74a67e75a00e musl-fix-testsuite.patch"
diff --git a/main/apr-util/musl-fix-testsuite.patch b/main/apr-util/musl-fix-testsuite.patch
new file mode 100644
index 0000000000..acf3c3126b
--- /dev/null
+++ b/main/apr-util/musl-fix-testsuite.patch
@@ -0,0 +1,19 @@
+diff --git a/test/testxlate.c b/test/testxlate.c
+index 6981eff..de00fa4 100644
+--- a/test/testxlate.c
++++ b/test/testxlate.c
+@@ -116,8 +116,12 @@ static void test_transformation(abts_case *tc, void *data)
+ }
+
+ /* 4. Transformation using charset aliases */
+- one_test(tc, "UTF-8", "UTF-7", test_utf8, test_utf7, p);
+- one_test(tc, "UTF-7", "UTF-8", test_utf7, test_utf8, p);
++ if (is_transform_supported(tc, "UTF-8", "UTF-7", p)) {
++ one_test(tc, "UTF-8", "UTF-7", test_utf8, test_utf7, p);
++ }
++ if (is_transform_supported(tc, "UTF-7", "UTF-8", p)) {
++ one_test(tc, "UTF-7", "UTF-8", test_utf7, test_utf8, p);
++ }
+ }
+
+ #endif /* APR_HAS_XLATE */