diff options
| author | davidovski <david@davidovski.xyz> | 2022-06-15 20:02:02 +0100 |
|---|---|---|
| committer | davidovski <david@davidovski.xyz> | 2022-06-15 20:02:02 +0100 |
| commit | d2567bfbdf0e9fa6db0a6ed1534831ec859a3e03 (patch) | |
| tree | 684a17eebf446aa1adab1097616f1882c8d51568 /repo/apr | |
| parent | d1fc3393cca72e8e432f827f7624e38734fad6dc (diff) | |
added deps for qemu
Diffstat (limited to 'repo/apr')
| -rw-r--r-- | repo/apr/apr-1.6.2-dont-test-dlclose.patch | 22 | ||||
| -rw-r--r-- | repo/apr/apr.xibuild | 30 | ||||
| -rw-r--r-- | repo/apr/semtimedop-s390x.patch | 16 |
3 files changed, 68 insertions, 0 deletions
diff --git a/repo/apr/apr-1.6.2-dont-test-dlclose.patch b/repo/apr/apr-1.6.2-dont-test-dlclose.patch new file mode 100644 index 0000000..df24254 --- /dev/null +++ b/repo/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); diff --git a/repo/apr/apr.xibuild b/repo/apr/apr.xibuild new file mode 100644 index 0000000..247dd3f --- /dev/null +++ b/repo/apr/apr.xibuild @@ -0,0 +1,30 @@ +#!/bin/sh + +NAME="apr" +DESC="The Apache Portable Runtime" + +MAKEDEPS="util-linux" + +PKG_VER=1.7.0 +SOURCE="https://www.apache.org/dist/apr/apr-$PKG_VER.tar.bz2" + +ADDITIONAL=" +apr-1.6.2-dont-test-dlclose.patch +semtimedop-s390x.patch +" + +prepare () { + apply_patches +} + +build() { + ./configure \ + --prefix=/usr \ + --datadir=/usr/share \ + --enable-nonportable-atomics \ + --with-devrandom=/dev/urandom + make +} +package() { + make DESTDIR="$PKG_DEST" install +} diff --git a/repo/apr/semtimedop-s390x.patch b/repo/apr/semtimedop-s390x.patch new file mode 100644 index 0000000..7c0d2cf --- /dev/null +++ b/repo/apr/semtimedop-s390x.patch @@ -0,0 +1,16 @@ +the testsuite hangs on s390x when testing locking mechanism sysvsem. Work +around by avoid use semtimedop for s390x. + +diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c +index 8e2187f..cad6c4a 100644 +--- a/locks/unix/proc_mutex.c ++++ b/locks/unix/proc_mutex.c +@@ -449,7 +449,7 @@ static const apr_proc_mutex_unix_lock_methods_t mutex_sysv_methods = + proc_mutex_sysv_create, + proc_mutex_sysv_acquire, + proc_mutex_sysv_tryacquire, +-#if defined(HAVE_SEMTIMEDOP) ++#if defined(HAVE_SEMTIMEDOP) && !defined(__s390x__) + proc_mutex_sysv_timedacquire, + #else + proc_mutex_spinsleep_timedacquire, |