From 5f1d44f27af5613e08c63bb8e269b52184bafa27 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sat, 5 Nov 2022 11:33:12 -0700
Subject: [PATCH] subversion: fix build for libtool 2.4.7

---
 srcpkgs/subversion/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index be37f60f967..a1eaf4565d0 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -24,6 +24,8 @@ distfiles="https://archive.apache.org/dist/subversion/subversion-${version}.tar.
 checksum=c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28
 
 pre_configure() {
+	./autogen.sh --release
+
 	# Based on native build values
 	cat <<-EOF >config.cache
 	ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
@@ -59,7 +61,12 @@ pre_configure() {
 	else
 		configure_args+=" --with-apxs"
 	fi
-	NOCONFIGURE=1 autoreconf -fi
+
+	if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+		# This test will fail when run as the root user,
+		# because flock() will ignore file permissions.
+		vsed -i subversion/tests/libsvn_fs/locks-test.c -e '/SVN_TEST_OPTS_PASS(obtain_write_lock_failure,/,+3d'
+	fi
 }
 
 post_configure() {