From e70a3461ff774c01eb6f659c800e99a745669b03 Mon Sep 17 00:00:00 2001 From: Greg Beard Date: Fri, 24 Mar 2023 06:54:43 +0000 Subject: [PATCH] apr: update to 1.7.2. --- srcpkgs/apr/patches/atomic64.patch | 56 ------------------------------ srcpkgs/apr/template | 11 ++---- 2 files changed, 3 insertions(+), 64 deletions(-) delete mode 100644 srcpkgs/apr/patches/atomic64.patch diff --git a/srcpkgs/apr/patches/atomic64.patch b/srcpkgs/apr/patches/atomic64.patch deleted file mode 100644 index ced9b7df0abd..000000000000 --- a/srcpkgs/apr/patches/atomic64.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 69e9378eb86357d4361322256d5d5a39ff4a592d -Author: q66 -Date: Fri Jan 10 13:04:37 2020 +0100 - - use __atomic builtins instead of legacy __sync - - This allows for 64-bit atomic ops on platforms that don't natively - support them such as armv6 and ppc32. - -diff --git atomic/unix/builtins64.c atomic/unix/builtins64.c -index 4a4b685..90b5c5e 100644 ---- a/atomic/unix/builtins64.c -+++ b/atomic/unix/builtins64.c -@@ -30,35 +30,34 @@ APR_DECLARE(void) apr_atomic_set64(volatile apr_uint64_t *mem, apr_uint64_t val) - - APR_DECLARE(apr_uint64_t) apr_atomic_add64(volatile apr_uint64_t *mem, apr_uint64_t val) - { -- return __sync_fetch_and_add(mem, val); -+ return __atomic_fetch_add(mem, val, __ATOMIC_SEQ_CST); - } - - APR_DECLARE(void) apr_atomic_sub64(volatile apr_uint64_t *mem, apr_uint64_t val) - { -- __sync_fetch_and_sub(mem, val); -+ __atomic_fetch_sub(mem, val, __ATOMIC_SEQ_CST); - } - - APR_DECLARE(apr_uint64_t) apr_atomic_inc64(volatile apr_uint64_t *mem) - { -- return __sync_fetch_and_add(mem, 1); -+ return __atomic_fetch_add(mem, 1, __ATOMIC_SEQ_CST); - } - - APR_DECLARE(int) apr_atomic_dec64(volatile apr_uint64_t *mem) - { -- return __sync_sub_and_fetch(mem, 1); -+ return (int)__atomic_sub_fetch(mem, 1, __ATOMIC_SEQ_CST); - } - - APR_DECLARE(apr_uint64_t) apr_atomic_cas64(volatile apr_uint64_t *mem, apr_uint64_t with, - apr_uint64_t cmp) - { -- return __sync_val_compare_and_swap(mem, cmp, with); -+ __atomic_compare_exchange_n(mem, &cmp, with, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); -+ return cmp; - } - - APR_DECLARE(apr_uint64_t) apr_atomic_xchg64(volatile apr_uint64_t *mem, apr_uint64_t val) - { -- __sync_synchronize(); -- -- return __sync_lock_test_and_set(mem, val); -+ return __atomic_exchange_n(mem, val, __ATOMIC_SEQ_CST); - } - - #endif /* USE_ATOMICS_BUILTINS */ diff --git a/srcpkgs/apr/template b/srcpkgs/apr/template index 6fb1fefd4f62..d636c8d52045 100644 --- a/srcpkgs/apr/template +++ b/srcpkgs/apr/template @@ -1,7 +1,7 @@ # Template file for 'apr' pkgname=apr -version=1.7.0 -revision=4 +version=1.7.2 +revision=1 build_style=gnu-configure configure_args="--with-installbuilddir=/usr/share/apr-1/build" makedepends="expat-devel libuuid-devel" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://apr.apache.org/" distfiles="https://www.apache.org/dist/apr/apr-${version}.tar.bz2" -checksum=e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea +checksum=75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e # Do not redefine struct iovec in include/apr_want.h CFLAGS="-DAPR_IOVEC_DEFINED=1" @@ -31,12 +31,8 @@ fi pre_build() { if [ "$CROSS_BUILD" ]; then - vsed -i Makefile \ - -e "/LINK_PROG.*OBJECTS_gen_test_char/s|.*|\t${BUILD_CC} ${BUILD_CFLAGS} tools/gen_test_char.c -o tools/gen_test_char|" # Fixup some not detected configure results to match native builds vsed -i include/apr.h \ - -e "/#define APR_HAVE_SHMEM_MMAP_ZERO/s;0;1;" \ - -e "/#define APR_HAVE_IOVEC/s;0;1;" \ -e "/#define APR_HAS_POSIXSEM_SERIALIZE/s;0;1;" \ -e "/#define APR_HAS_PROC_PTHREAD_SERIALIZE/s;0;1;" fi @@ -45,7 +41,6 @@ pre_build() { post_install() { if [ "$CROSS_BUILD" ]; then vsed -i -e "s,$XBPS_CROSS_BASE,,g" \ - "$DESTDIR/usr/bin/apr-1-config" \ "$DESTDIR/usr/share/apr-1/build/apr_rules.mk" fi }