[PR PATCH] apr-util: update to 1.6.3

[PR PATCH] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 973 bytes --]

There is a new pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc
- fix crossbuild issue (some issues left)

#### Testing the changes
- I tested the changes in this PR: crossbuilds failing

Crossbuild from x86_64-glibc to aarch64-glibc:
[apr-util.log](https://github.com/void-linux/void-packages/files/10903642/apr-util.log)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures: all crossbuilds fail

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 3015 bytes --]

From 31432a6759b5af6767d1ba282286857615e4c99c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH] apr-util: update to 1.6.3

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc
- fix crossbuild issue (some issues left)
---
 srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
 srcpkgs/apr-util/template            | 20 ++++++++++++--------
 2 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb..000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a..44c5567a037b 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,14 +1,15 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
- --with-pgsql --with-ldap
+ --with-pgsql --with-ldap-lib=${XBPS_CROSS_BASE}/usr
  --with-expat=${XBPS_CROSS_BASE}/usr --with-gdbm=${XBPS_CROSS_BASE}/usr
  --with-sqlite3=${XBPS_CROSS_BASE}/usr --with-mysql=${XBPS_CROSS_BASE}/usr
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
- --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
+ --with-dbm=db53 --with-crypto --with-openssl=${XBPS_CROSS_BASE}/usr
+ --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
 makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
@@ -17,10 +18,13 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
-# fails to build tests
-make_check=no
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
+
+# disable tests on musl (testxlate fails)
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	make_check=no
+fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

Re: [PR PATCH] [Updated] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 978 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc
- fix crossbuild issue (some issues left)

#### Testing the changes
- I tested the changes in this PR: crossbuilds failing

Crossbuild from x86_64-glibc to aarch64-glibc:
[apr-util.log](https://github.com/void-linux/void-packages/files/10903642/apr-util.log)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures: all crossbuilds fail

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 3016 bytes --]

From 1024444026855c1fbe6ad6e704889d9aaa9462c4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH] apr-util: update to 1.6.3

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc
- fix crossbuild issue (some issues left)
---
 srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
 srcpkgs/apr-util/template            | 20 ++++++++++++--------
 2 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb..000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a..2269985cd415 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,14 +1,15 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
- --with-pgsql --with-ldap
+ --with-pgsql --with-ldap-lib=${XBPS_CROSS_BASE}/usr
  --with-expat=${XBPS_CROSS_BASE}/usr --with-gdbm=${XBPS_CROSS_BASE}/usr
  --with-sqlite3=${XBPS_CROSS_BASE}/usr --with-mysql=${XBPS_CROSS_BASE}/usr
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
- --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
+ --with-dbm=db53 --with-crypto --with-openssl=${XBPS_CROSS_BASE}/usr
+ --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
 makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
@@ -17,10 +18,13 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
-# fails to build tests
-make_check=no
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# disable tests on musl (testxlate fails)
+	make_check=no
+fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

Re: [PR PATCH] [Updated] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 978 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc
- fix crossbuild issue (some issues left)

#### Testing the changes
- I tested the changes in this PR: crossbuilds failing

Crossbuild from x86_64-glibc to aarch64-glibc:
[apr-util.log](https://github.com/void-linux/void-packages/files/10903642/apr-util.log)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures: all crossbuilds fail

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 3028 bytes --]

From 4a5baef6190d5b382400c545c211ea1bf6f63f23 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH] apr-util: update to 1.6.3

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc
- fix crossbuild issue (some issues left)
---
 srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
 srcpkgs/apr-util/template            | 20 ++++++++++++--------
 2 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb..000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a..7b91c9f32d5c 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,14 +1,15 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
- --with-pgsql --with-ldap
+ --with-pgsql --with-ldap --with-ldap-lib=${XBPS_CROSS_BASE}/usr
  --with-expat=${XBPS_CROSS_BASE}/usr --with-gdbm=${XBPS_CROSS_BASE}/usr
  --with-sqlite3=${XBPS_CROSS_BASE}/usr --with-mysql=${XBPS_CROSS_BASE}/usr
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
- --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
+ --with-dbm=db53 --with-crypto --with-openssl=${XBPS_CROSS_BASE}/usr
+ --without-oracle --enable-util-dso"
 hostmakedepends="libtool apr-devel"
 makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
@@ -17,10 +18,13 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
-# fails to build tests
-make_check=no
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# disable tests on musl (testxlate fails)
+	make_check=no
+fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 288 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1457173078

Comment:
The test suite seems to fail randomly even on glibc (cannot reproduce that on my local machine though) so may have to disable it completely again.

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 451 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1457268914

Comment:
I feel like I'm in over my head on this one.
```
/usr/bin/ld: dbm/.libs/apr_dbm_gdbm.o: Relocations in generic ELF (EM: 183)
/usr/bin/ld: dbm/.libs/apr_dbm_gdbm.o: error adding symbols: file in wrong format
```
Is it really correct that the host linker is used rather than the one from the crosscompiler?

Re: [PR PATCH] [Updated] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 935 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc

#### Testing the changes
- I tested the changes in this PR: crossbuilds failing

Crossbuild from x86_64-glibc to aarch64-glibc:
[apr-util.log](https://github.com/void-linux/void-packages/files/10903642/apr-util.log)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures: all crossbuilds fail

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 2321 bytes --]

From 0676b4bd4e02d4fd796645f5c0d7b6f6b89f751d Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH] apr-util: update to 1.6.2

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc
---
 srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
 srcpkgs/apr-util/template            | 15 +++++++++------
 2 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb..000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a..85faaf6b5f03 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -17,10 +17,13 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
-# fails to build tests
-make_check=no
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	# disable tests on musl (testxlate fails)
+	make_check=no
+fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

Re: [PR PATCH] [Updated] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 935 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc

#### Testing the changes
- I tested the changes in this PR: crossbuilds failing

Crossbuild from x86_64-glibc to aarch64-glibc:
[apr-util.log](https://github.com/void-linux/void-packages/files/10903642/apr-util.log)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures: all crossbuilds fail

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 2181 bytes --]

From a638a457f4c4ba422876d5eee2959cfed8821f78 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH] apr-util: update to 1.6.2

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
---
 srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
 srcpkgs/apr-util/template            |  9 +++++----
 2 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb..000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a..5c84e570a29e 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -17,11 +17,12 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
+
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	LDFLAGS="-latomic"

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1462383235

Comment:
configure script complains of:
```
configure: WARNING: unrecognized options: --with-sysroot, --with-libtool-sysroot
```
which may be related

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 418 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1462383235

Comment:
configure script complains of:
```
configure: WARNING: unrecognized options: --with-sysroot, --with-libtool-sysroot
```
which may be related.

The options are set as:
```
"--with-sysroot=/usr/aarch64-linux-gnu" \
"--with-libtool-sysroot=/usr/aarch64-linux-gnu" \
```

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1462439542

Comment:
I think I've found the issue. If I revert dd789b95eb6490221ae8a53d741d9b873462938c from #40606 it crosscompiles fine.

Re: [PR PATCH] [Updated] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 935 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc

#### Testing the changes
- I tested the changes in this PR: crossbuilds failing

Crossbuild from x86_64-glibc to aarch64-glibc:
[apr-util.log](https://github.com/void-linux/void-packages/files/10903642/apr-util.log)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures: all crossbuilds fail

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 4319 bytes --]

From 4024c82129ae270717f2f5431c5e710a21ac1b44 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 1/2] apr-util: update to 1.6.2

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
---
 srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
 srcpkgs/apr-util/template            |  9 +++++----
 2 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb..000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a..5c84e570a29e 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -17,11 +17,12 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
+
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	LDFLAGS="-latomic"

From 30dd9bd5d50136f511f5bc8e70e458912f46cdd1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 9 Mar 2023 18:09:13 +0100
Subject: [PATCH 2/2] Revert "libtool: fix include paths when cross compiling"

This reverts commit dd789b95eb6490221ae8a53d741d9b873462938c.

This fixes the cross-compile issue in apr-util
---
 srcpkgs/libtool/template | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index 4eea61b17c49..cd7c684c5945 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=4
+revision=3
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -38,8 +38,8 @@ post_install() {
 	# things that need to go; the target libtool script is meant to be used
 	# in native environments, not in cross environments, so patch the script
 	if [ "$CROSS_BUILD" ]; then
-		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="ar"
-		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
+		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="${AR:=ar}"
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present
@@ -50,20 +50,6 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
-		# Strip cross sysroot from paths
-		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
-		 ${PKGDESTDIR}/usr/bin/libtool
-
-		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
-			vsed -i \
-			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
-			 ${PKGDESTDIR}/usr/bin/libtool
-		else
-			vsed -i \
-			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
-			 ${PKGDESTDIR}/usr/bin/libtool
-		fi
-
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')

Re: apr-util: update to 1.6.3

[paper42]

[-- Attachment #1: Type: text/plain, Size: 339 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1462567921

Comment:
> I think I've found the issue. If I revert [dd789b9](https://github.com/void-linux/void-packages/commit/dd789b95eb6490221ae8a53d741d9b873462938c) from #40606 it crosscompiles fine.

cc @oreo639 

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 911 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1462615003

Comment:
If I look into the libtool script without the commit i get:
```
# The linker used to build libraries.
LD=${LD:=ld}
```
which allows the linker to be overridden by the environment. With the commit i get:
```
# The linker used to build libraries.
LD="ld"
```
which sets the linker unconditionally.

So the problematic part of the commit is probably:
```
-               # e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="${AR:=ar}"
-               vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
+               # e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="ar"
+               vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
```

I'll revert that part only and see if it still builds ok.

Re: [PR PATCH] [Updated] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 935 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc

#### Testing the changes
- I tested the changes in this PR: crossbuilds failing

Crossbuild from x86_64-glibc to aarch64-glibc:
[apr-util.log](https://github.com/void-linux/void-packages/files/10903642/apr-util.log)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures: all crossbuilds fail

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 4294 bytes --]

From 319c5227fb17ef465dd31856c1d854ee785cc124 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 1/2] apr-util: update to 1.6.2

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
- switch to vsed
---
 srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
 srcpkgs/apr-util/template            | 14 +++++++-------
 2 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb..000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a..be17f747c0c7 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -17,18 +17,19 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
+
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	LDFLAGS="-latomic"
 fi
 
 pre_configure() {
-	sed -i configure \
+	vsed -i configure \
 		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
 	if [ "$CROSS_BUILD" ]; then
 		configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
@@ -39,7 +40,7 @@ pre_configure() {
 
 post_configure() {
 	# Hacks to make cross compiling work
-	sed -i build/rules.mk \
+	vsed -i build/rules.mk \
 		-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
 		-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
 		-e "s;--mode=link;& --tag=CC;g" \
@@ -47,7 +48,6 @@ post_configure() {
 		-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
 		-e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
 		-e '/^LINK /s;$(COMPILE);$(CC);'
-
 }
 
 post_install() {

From 1f3569b09cdf9a6ca0a35af5576595f737692a49 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 9 Mar 2023 20:09:19 +0100
Subject: [PATCH 2/2] libtool: allow programs to be overridden again

---
 srcpkgs/libtool/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index 4eea61b17c49..1a268a26c2f9 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -38,8 +38,8 @@ post_install() {
 	# things that need to go; the target libtool script is meant to be used
 	# in native environments, not in cross environments, so patch the script
 	if [ "$CROSS_BUILD" ]; then
-		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="ar"
-		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
+		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="${AR:=ar}"
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present

Re: [PR PATCH] [Updated] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 935 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc

#### Testing the changes
- I tested the changes in this PR: crossbuilds failing

Crossbuild from x86_64-glibc to aarch64-glibc:
[apr-util.log](https://github.com/void-linux/void-packages/files/10903642/apr-util.log)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures: all crossbuilds fail

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 4765 bytes --]

From c1fd1fb9957b9fc964471ee3b109353a6048f909 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 1/2] apr-util: update to 1.6.2

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
- switch to vsed
---
 srcpkgs/apr-util/patches/mysql.patch | 15 --------------
 srcpkgs/apr-util/template            | 30 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb..000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a..2a5ec59fbf72 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -17,18 +17,19 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
+
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	LDFLAGS="-latomic"
 fi
 
 pre_configure() {
-	sed -i configure \
+	vsed -i configure \
 		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
 	if [ "$CROSS_BUILD" ]; then
 		configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
@@ -39,15 +40,16 @@ pre_configure() {
 
 post_configure() {
 	# Hacks to make cross compiling work
-	sed -i build/rules.mk \
-		-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;--mode=link;& --tag=CC;g" \
-		-e "s;--mode=compile;& --tag=CC;g" \
-		-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
-		-e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
-		-e '/^LINK /s;$(COMPILE);$(CC);'
-
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i build/rules.mk \
+			-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;--mode=link;& --tag=CC;g" \
+			-e "s;--mode=compile;& --tag=CC;g" \
+			-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
+			-e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
+			-e '/^LINK /s;$(COMPILE);$(CC);'
+	fi
 }
 
 post_install() {

From 5e22e58587c532aa527e2a377c081a2dc123251e Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 9 Mar 2023 20:09:19 +0100
Subject: [PATCH 2/2] libtool: allow programs to be overridden again

---
 srcpkgs/libtool/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index 4eea61b17c49..1a268a26c2f9 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -38,8 +38,8 @@ post_install() {
 	# things that need to go; the target libtool script is meant to be used
 	# in native environments, not in cross environments, so patch the script
 	if [ "$CROSS_BUILD" ]; then
-		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="ar"
-		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
+		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="${AR:=ar}"
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present

Re: [PR PATCH] [Updated] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 935 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch
- only disable tests on musl. Seems ok on glibc

#### Testing the changes
- I tested the changes in this PR: crossbuilds failing

Crossbuild from x86_64-glibc to aarch64-glibc:
[apr-util.log](https://github.com/void-linux/void-packages/files/10903642/apr-util.log)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures: all crossbuilds fail

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 4723 bytes --]

From 5d7e3d8702675bd7ca96666af704b35de147e48a Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 1/2] apr-util: update to 1.6.2

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
- switch to vsed
---
 srcpkgs/apr-util/patches/mysql.patch | 15 --------------
 srcpkgs/apr-util/template            | 29 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb..000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a..6b5ba0ec230f 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
@@ -28,7 +28,7 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 pre_configure() {
-	sed -i configure \
+	vsed -i configure \
 		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
 	if [ "$CROSS_BUILD" ]; then
 		configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
@@ -39,15 +39,16 @@ pre_configure() {
 
 post_configure() {
 	# Hacks to make cross compiling work
-	sed -i build/rules.mk \
-		-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;--mode=link;& --tag=CC;g" \
-		-e "s;--mode=compile;& --tag=CC;g" \
-		-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
-		-e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
-		-e '/^LINK /s;$(COMPILE);$(CC);'
-
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i build/rules.mk \
+			-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;--mode=link;& --tag=CC;g" \
+			-e "s;--mode=compile;& --tag=CC;g" \
+			-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
+			-e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
+			-e '/^LINK /s;$(COMPILE);$(CC);'
+	fi
 }
 
 post_install() {

From ae53fdf53739e750b8ff869587046bda8a32e3e1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 9 Mar 2023 20:09:19 +0100
Subject: [PATCH 2/2] libtool: allow programs to be overridden again

---
 srcpkgs/libtool/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index 4eea61b17c49..1a268a26c2f9 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -38,8 +38,8 @@ post_install() {
 	# things that need to go; the target libtool script is meant to be used
 	# in native environments, not in cross environments, so patch the script
 	if [ "$CROSS_BUILD" ]; then
-		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="ar"
-		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
+		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="${AR:=ar}"
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1462820131

Comment:
The arm libtool should be consistent with the x86_64 libtool, I'm not sure why this change should be made for one but not the other (or at all).

If you need `LD=${LD:=ld}`, maybe you can sed libtool to XBPS_WRAPPERDIR and use that?

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 421 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1462820131

Comment:
The arm libtool should be consistent with the x86_64 libtool, I'm not sure why this change should be made for one but not the other (especially if this patch breaks building some packages).

If you need `LD=${LD:=ld}`, maybe you can sed libtool to XBPS_WRAPPERDIR and use that?

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 421 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1462820131

Comment:
The arm libtool should be consistent with the x86_64 libtool, I'm not sure why this change should be made for one but not the other (especially if that patch breaks building some packages).

If you need `LD=${LD:=ld}`, maybe you can sed libtool to XBPS_WRAPPERDIR and use that?

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 430 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1462820131

Comment:
The arm libtool should be consistent with the x86_64 libtool, I'm not sure why this change should be made for one but not the other (especially if that patch breaks building some packages like NTL).

If you need `LD=${LD:=ld}`, maybe you can sed libtool to XBPS_WRAPPERDIR and use that?

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 430 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1462820131

Comment:
The arm libtool should be consistent with the x86_64 libtool, I'm not sure why this change should be made for one but not the other (especially if that patch breaks building some packages like ntl).

If you need `LD=${LD:=ld}`, maybe you can sed libtool to XBPS_WRAPPERDIR and use that?

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 446 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1462820131

Comment:
The arm libtool package should be consistent with the x86_64 libtool package, I'm not sure why this change should be made for one but not the other (especially if that patch breaks building some packages like ntl).

If you need `LD=${LD:=ld}`, maybe you can sed libtool to XBPS_WRAPPERDIR and use that?

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1462820131

Comment:
The arm libtool package should be consistent with the x86_64 libtool package, I'm not sure why this change should be made for one but not the other (especially if that patch breaks building C++ applications like ntl).

If you need `LD=${LD:=ld}`, maybe you can sed libtool to XBPS_WRAPPERDIR and use that?

Re: [PR PATCH] [Updated] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 886 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch

#### Testing the changes
- I tested the changes in this PR: I don't use this package directly. Crossbuilds ok with libtool change

Crossbuild from x86_64-glibc to aarch64-glibc without libtool change:
[apr-util.log](https://github.com/void-linux/void-packages/files/10903642/apr-util.log)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 3690 bytes --]

From 90d6461a7c99c1e777793a766cde424089b844e6 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH] apr-util: update to 1.6.3

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
- switch to vsed
- use wrapperdir for libtool to enable overriding CC
---
 srcpkgs/apr-util/patches/mysql.patch | 15 -------------
 srcpkgs/apr-util/template            | 33 ++++++++++++++++------------
 2 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb..000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a..f527d68aa6d4 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
@@ -28,7 +28,7 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 pre_configure() {
-	sed -i configure \
+	vsed -i configure \
 		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
 	if [ "$CROSS_BUILD" ]; then
 		configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
@@ -39,15 +39,20 @@ pre_configure() {
 
 post_configure() {
 	# Hacks to make cross compiling work
-	sed -i build/rules.mk \
-		-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;--mode=link;& --tag=CC;g" \
-		-e "s;--mode=compile;& --tag=CC;g" \
-		-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
-		-e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
-		-e '/^LINK /s;$(COMPILE);$(CC);'
-
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i build/rules.mk \
+			-e "/^LIBTOOL=/s;(apr_builddir);{XBPS_WRAPPERDIR};" \
+			-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;--mode=link;& --tag=CC;g" \
+			-e "s;--mode=compile;& --tag=CC;g" \
+			-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
+			-e '/^LINK /s;$(COMPILE);$(CC);'
+		# Allow environment to override CC, otherwise the host linker is used
+		sed ${XBPS_CROSS_BASE}/usr/bin/libtool \
+			-e 's;^\(CC\)="\(.\+\)"$;\1="${\1:=\2}";g' \
+			> ${XBPS_WRAPPERDIR}/libtool
+	fi
 }
 
 post_install() {

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1462888847

Comment:
> If you need `LD=${LD:=ld}`, maybe you can sed libtool to XBPS_WRAPPERDIR and use that?
That worked, thanks!

This should be mostly ready now. Though I don't use this package directly so additional testing would be appreciated.

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 375 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1462888847

Comment:
> If you need `LD=${LD:=ld}`, maybe you can sed libtool to XBPS_WRAPPERDIR and use that?

That worked, thanks!

This should be mostly ready now. Though I don't use this package directly so additional testing would be appreciated.

Re: [PR PATCH] [Updated] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 688 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch

#### Testing the changes
- I tested the changes in this PR: I don't use this package directly

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 3693 bytes --]

From 752f7c61540ddc37311b74595eafeb33c69bdd7f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH] apr-util: update to 1.6.3

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
- switch to vsed
- use wrapperdir for libtool to enable overriding CC
---
 srcpkgs/apr-util/patches/mysql.patch | 15 -------------
 srcpkgs/apr-util/template            | 33 ++++++++++++++++------------
 2 files changed, 19 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb..000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a..83d0651ab772 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+distfiles="https://archive.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
@@ -28,7 +28,7 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 pre_configure() {
-	sed -i configure \
+	vsed -i configure \
 		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
 	if [ "$CROSS_BUILD" ]; then
 		configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
@@ -39,15 +39,20 @@ pre_configure() {
 
 post_configure() {
 	# Hacks to make cross compiling work
-	sed -i build/rules.mk \
-		-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;--mode=link;& --tag=CC;g" \
-		-e "s;--mode=compile;& --tag=CC;g" \
-		-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
-		-e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
-		-e '/^LINK /s;$(COMPILE);$(CC);'
-
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i build/rules.mk \
+			-e "/^LIBTOOL=/s;(apr_builddir);{XBPS_WRAPPERDIR};" \
+			-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;--mode=link;& --tag=CC;g" \
+			-e "s;--mode=compile;& --tag=CC;g" \
+			-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
+			-e '/^LINK /s;$(COMPILE);$(CC);'
+		# Allow environment to override CC, otherwise the host linker is used
+		sed ${XBPS_CROSS_BASE}/usr/bin/libtool \
+			-e 's;^\(CC\)="\(.\+\)"$;\1="${\1:=\2}";g' \
+			> ${XBPS_WRAPPERDIR}/libtool
+	fi
 }
 
 post_install() {

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1548201824

Comment:
Use archive.apache.org instead of  downloads.apache.org as the former does not delete outdated versions.

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 395 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1548201824

Comment:
Use archive.apache.org instead of  downloads.apache.org as the former does not delete outdated versions.
I've also verified that the cross-compilation fix also works on 1.6.1, and if it's preferred for that to be fixed separately I can create a new PR.

Re: apr-util: update to 1.6.3

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665353717

Comment:
I'm seeing the same `configure: WARNING: unrecognized options: --with-sysroot, --with-libtool-sysroot` when cross compiling coreutils in https://github.com/void-linux/void-packages/pull/45305 Can you remind me how to deal with it?

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 501 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665403359

Comment:
That just means that those options aren't being used.
For example, `--with-sysroot` is used by gmp because the configure script was generated on a distro where libtool uses the `--with-sysroot` variable, whereas if it was generated on Void it would use the `--with-libtool-sysroot` variable since we patched libtool.

This package doesn't use autoconf btw.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 504 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665403359

Comment:
That just means that those options aren't being used.
For example, `--with-sysroot` is used by gmp because the `aclocal.m4` script was generated on a distro where libtool uses the `--with-sysroot` variable, whereas if it was generated on Void it would use the `--with-libtool-sysroot` variable since we patched libtool.

This package doesn't use autoconf btw.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 464 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665403359

Comment:
That just means that those options aren't being used.
For example, `--with-sysroot` is used by gmp because the `aclocal.m4` script was generated on a distro where libtool uses the `--with-sysroot` variable, whereas if it was generated on Void it would use the `--with-libtool-sysroot` variable since we patched libtool.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665405160

Comment:
(It does use autoconf, sorry, it is just named `*.in` instead of `*.ac`)

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665405160

Comment:
(It does use autoconf, sorry, it is just named `*.in` instead of `*.ac`)

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665408463

Comment:
(Correction: this package does use autoconf, I just got mixed up, since the file was named `configure.in` instead of `configure.ac`)

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665408463

Comment:
(Correction: this package does use autoconf, I just got mixed up, since the file was named `configure.in` instead of `configure.ac`)

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 651 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665403359

Comment:
That just means that those options aren't being used.
For example, `--with-sysroot` is used by gmp because the `aclocal.m4` script was generated on a distro where libtool uses the `--with-sysroot` variable, whereas if it was generated on Void it would use the `--with-libtool-sysroot` variable since we patched libtool.

In your case the package doesn't use libtool and it doesn't check `--with-sysroot` manually so neither of the variables are used.

In other words, you shouldn't need to do anything.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 657 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665403359

Comment:
That just means that those options aren't being used.
For example, `--with-sysroot` is used by gmp because the `aclocal.m4` script was generated on a distro where libtool uses the `--with-sysroot` variable, whereas if it was generated on Void it would use the `--with-libtool-sysroot` variable since we patched libtool.

In your case the package doesn't perform `LT_INIT` and it doesn't check `--with-sysroot` manually so neither of the variables are used.

In other words, you shouldn't need to do anything.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 655 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665403359

Comment:
That just means that those options aren't being used.
For example, `--with-sysroot` is used by gmp because the `aclocal.m4` script was generated on a distro where libtool uses the `--with-sysroot` variable, whereas if it was generated on Void it would use the `--with-libtool-sysroot` variable since we patched libtool.

Both cases the package doesn't perform `LT_INIT` and it doesn't check `--with-sysroot` manually so neither of the variables are used.

In other words, you shouldn't need to do anything.

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 550 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665424234

Comment:
You could try `autoreconf -fi` to replace it with Void's version but I don't think it's what causes the failures (the crossbuilds seem to complete, which would be the most likely to fail as a result of the flags not being used correctly. I'm no expert at autoconf/autotools, though).

For the test failure, it's probably more likely the CI restricts the inotify feature if it doesn't happen to you locally.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665447232

Comment:
It is not a failure, it is a warning.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665447232

Comment:
It is not a failure, it is a warning (one that can be safely ignored in this case).

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 312 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665449776

Comment:
> It is not a failure, it is a warning (one that can be safely ignored in this case).

I also referred to the test failure in my first sentence, sorry if I was unclear.

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 561 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665424234

Comment:
You could try `autoreconf -fi` to replace it with Void's version but I don't think it's what causes the test failure (the crossbuilds seem to complete, which would be the most likely to fail as a result of the flags not being used correctly. I'm no expert at autoconf/autotools, though).

It's probably more likely the failure is a result of the CI restricting the inotify feature if it doesn't happen to you locally.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 152 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665451684

Comment:
Ah, sorry.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665451684

Comment:
Ah, my bad.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 672 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665403359

Comment:
That just means that those options aren't being used.
For example, `--with-sysroot` is used by gmp because the `aclocal.m4` script was generated on a distro where libtool uses the `--with-sysroot` variable, whereas if it was generated on Void it would use the `--with-libtool-sysroot` variable since we patched libtool.

Both apr-util and coreutils the package doesn't perform `LT_INIT` and it doesn't check `--with-sysroot` manually so neither of the variables are used.

In other words, you shouldn't need to do anything.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 667 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665403359

Comment:
That just means that those options aren't being used.
For example, `--with-sysroot` is used by gmp because the `aclocal.m4` script was generated on a distro where libtool uses the `--with-sysroot` variable, whereas if it was generated on Void it would use the `--with-libtool-sysroot` variable since we patched libtool.

Both apr-util and coreutils the package doesn't perform `LT_INIT` and don't check `--with-sysroot` manually so neither of the variables are used.

In other words, you shouldn't need to do anything.

Re: apr-util: update to 1.6.3

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 257 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1665582721

Comment:
Thank you, then I'll ignore the warning.
Right, the test failure is only on CI (locally it passes), likely unrelated.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670225191

Comment:
Also, @klarasm here is a solution without the libtool hack:
https://github.com/oreo639/void-packages/commit/d6ed53215f78001a824885598f05b37ba023c1a5

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670225191

Comment:
Also, @klarasm here is a solution without the libtool wrapdir thing:
https://github.com/oreo639/void-packages/commit/c12691f13c8276998226481da11ec7c55236a87f

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 307 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670225191

Comment:
Also, @klarasm here is a solution without the libtool wrapdir thing:
https://github.com/void-linux/void-packages/compare/master...oreo639:void-packages:apr-util

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670225191

Comment:
Also, @klarasm here is a better solution without the libtool wrapdir thing:
https://github.com/void-linux/void-packages/compare/master...oreo639:void-packages:apr-util

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670398382

Comment:
I may have overlooked some vseds when applying...

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670399861

Comment:
The vsed should be `if [ "$CROSS_BUILD" ]; then`, sorry.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670399861

Comment:
The vsed should be `if [ "$CROSS_BUILD" ]; then`, sorry. (the builders use `./xbps-src -s pkg` which checks will error if the result of the sed is the same as before the command was run)

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670399861

Comment:
The vsed should be `if [ "$CROSS_BUILD" ]; then`, sorry.

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 281 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670401517

Comment:
> The vsed should be `if [ "$CROSS_BUILD" ]; then`, sorry.

No worries. The 32bit arm crossbuilds seems to fail unrelated to this though.

Re: [PR PATCH] [Updated] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 784 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch
- switch to vsed
- use wrapperdir for libtool to enable overriding CC (this fixes crossbuild)

#### Testing the changes
- I tested the changes in this PR: I don't use this package directly

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 5201 bytes --]

From def2f6c0cfe4cf08aa08080c1025677882776ef4 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH] apr-util: update to 1.6.3

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
- switch to vsed
- cross-compilation fix (thanks @oreo639)
---
 .../apr-util/patches/fix-cross-libtool.patch  | 22 ++++++++++
 srcpkgs/apr-util/patches/mysql.patch          | 15 -------
 srcpkgs/apr-util/template                     | 40 +++++++++----------
 3 files changed, 40 insertions(+), 37 deletions(-)
 create mode 100644 srcpkgs/apr-util/patches/fix-cross-libtool.patch
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/fix-cross-libtool.patch b/srcpkgs/apr-util/patches/fix-cross-libtool.patch
new file mode 100644
index 0000000000000..39af2fe0bcaf4
--- /dev/null
+++ b/srcpkgs/apr-util/patches/fix-cross-libtool.patch
@@ -0,0 +1,22 @@
+Taken from: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/apr-util/files/apr-util-1.6.1-libtool.patch
+
+https://bugs.gentoo.org/779487
+
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 20:20:09 -0700
+Subject: [PATCH] configure: Add missing LT_INIT
+
+This fixes the build with rlibtool which requires the generated libtool
+to determine if building shared or static libraries.
+
+--- a/configure.in
++++ b/configure.in
+@@ -8,6 +8,8 @@ AC_INIT(export_vars.sh.in)
+ AC_CONFIG_HEADER(include/private/apu_config.h)
+ AC_CONFIG_AUX_DIR(build)
+ 
++LT_INIT
++
+ sinclude(build/apu-conf.m4)
+ sinclude(build/apu-iconv.m4)
+ sinclude(build/apu-hints.m4)
diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb3..0000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 17a94361cd32d..924f2e04d0398 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,15 +1,15 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
- --with-pgsql --with-ldap
+ --with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr
  --with-expat=${XBPS_CROSS_BASE}/usr --with-gdbm=${XBPS_CROSS_BASE}/usr
  --with-sqlite3=${XBPS_CROSS_BASE}/usr --with-mysql=${XBPS_CROSS_BASE}/usr
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
-hostmakedepends="libtool apr-devel"
+hostmakedepends="libtool apr-devel automake"
 makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+distfiles="https://archive.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
@@ -27,26 +27,22 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 pre_configure() {
-	sed -i configure \
-		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
-	if [ "$CROSS_BUILD" ]; then
-		configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
-	else
-		configure_args+=" --with-apr=/usr/bin/apr-1-config"
-	fi
+	autoreconf -fi
 }
 
 post_configure() {
 	# Hacks to make cross compiling work
-	sed -i build/rules.mk \
-		-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;--mode=link;& --tag=CC;g" \
-		-e "s;--mode=compile;& --tag=CC;g" \
-		-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
-		-e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
-		-e '/^LINK /s;$(COMPILE);$(CC);'
-
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i build/rules.mk \
+			-e "/^LIBTOOL=/s;(apr_builddir);(top_builddir);" \
+			-e "s;\(top_builddir=\)\(.*\);\1${wrksrc};" \
+			-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;--mode=link;& --tag=CC;g" \
+			-e "s;--mode=compile;& --tag=CC;g" \
+			-e "/^CC=/s:=.*:=${CC}:" \
+			-e '/^LTFLAGS/s:--silent::'
+	fi
 }
 
 post_install() {

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 394 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670401517

Comment:
> The vsed should be `if [ "$CROSS_BUILD" ]; then`, sorry.

No worries. The 32bit arm crossbuilds seems to fail unrelated to this, though. There seems to be a `-mtune=generic` inserted in the CFLAGS somehow which I guess does not exist on 32 bit arm?

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670411952

Comment:
You can use `-e "/^CFLAGS=/s:=.*:=${CFLAGS}:"`, I updated my branch here:
https://github.com/void-linux/void-packages/compare/master...oreo639:void-packages:apr-util

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670411952

Comment:
You can use `-e "/^CFLAGS=/s:=.*:=${CFLAGS}:"`, I updated my branch here.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670411952

Comment:
You can use `-e "/^CFLAGS=/s:=.*:=${CFLAGS}:"` in the vsed, I updated my branch here.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 201 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670411952

Comment:
You can use `-e "/^CFLAGS=/s:=.*:=${CFLAGS}:"` in the vsed.

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670411952

Comment:
You can fix that by using `-e "/^CFLAGS=/s:=.*:=${CFLAGS}:"` in the vsed.

Re: [PR PATCH] [Updated] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 784 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch
- switch to vsed
- use wrapperdir for libtool to enable overriding CC (this fixes crossbuild)

#### Testing the changes
- I tested the changes in this PR: I don't use this package directly

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 5261 bytes --]

From f69dd98354be60dfad55b8921b6a64e76660d135 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH] apr-util: update to 1.6.3

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
- switch to vsed
- cross-compilation fix (thanks @oreo639)
---
 .../apr-util/patches/fix-cross-libtool.patch  | 22 ++++++++++
 srcpkgs/apr-util/patches/mysql.patch          | 15 -------
 srcpkgs/apr-util/template                     | 42 +++++++++----------
 3 files changed, 42 insertions(+), 37 deletions(-)
 create mode 100644 srcpkgs/apr-util/patches/fix-cross-libtool.patch
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/fix-cross-libtool.patch b/srcpkgs/apr-util/patches/fix-cross-libtool.patch
new file mode 100644
index 0000000000000..39af2fe0bcaf4
--- /dev/null
+++ b/srcpkgs/apr-util/patches/fix-cross-libtool.patch
@@ -0,0 +1,22 @@
+Taken from: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/apr-util/files/apr-util-1.6.1-libtool.patch
+
+https://bugs.gentoo.org/779487
+
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 20:20:09 -0700
+Subject: [PATCH] configure: Add missing LT_INIT
+
+This fixes the build with rlibtool which requires the generated libtool
+to determine if building shared or static libraries.
+
+--- a/configure.in
++++ b/configure.in
+@@ -8,6 +8,8 @@ AC_INIT(export_vars.sh.in)
+ AC_CONFIG_HEADER(include/private/apu_config.h)
+ AC_CONFIG_AUX_DIR(build)
+ 
++LT_INIT
++
+ sinclude(build/apu-conf.m4)
+ sinclude(build/apu-iconv.m4)
+ sinclude(build/apu-hints.m4)
diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb3..0000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 17a94361cd32d..496fb7d692fcc 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,15 +1,15 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
- --with-pgsql --with-ldap
+ --with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr
  --with-expat=${XBPS_CROSS_BASE}/usr --with-gdbm=${XBPS_CROSS_BASE}/usr
  --with-sqlite3=${XBPS_CROSS_BASE}/usr --with-mysql=${XBPS_CROSS_BASE}/usr
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
-hostmakedepends="libtool apr-devel"
+hostmakedepends="libtool apr-devel automake"
 makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
@@ -17,8 +17,8 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+distfiles="https://archive.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
@@ -27,26 +27,24 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 pre_configure() {
-	sed -i configure \
-		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
-	if [ "$CROSS_BUILD" ]; then
-		configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
-	else
-		configure_args+=" --with-apr=/usr/bin/apr-1-config"
-	fi
+	autoreconf -fi
 }
 
 post_configure() {
 	# Hacks to make cross compiling work
-	sed -i build/rules.mk \
-		-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;--mode=link;& --tag=CC;g" \
-		-e "s;--mode=compile;& --tag=CC;g" \
-		-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
-		-e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
-		-e '/^LINK /s;$(COMPILE);$(CC);'
-
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i build/rules.mk \
+			-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;--mode=link;& --tag=CC;g" \
+			-e "s;--mode=compile;& --tag=CC;g" \
+			-e "/^CC=/s:=.*:=${CC}:"
+	fi
+	vsed -i build/rules.mk \
+		-e "/^LIBTOOL=/s;(apr_builddir);(top_builddir);" \
+		-e "s;\(top_builddir=\)\(.*\);\1${wrksrc};" \
+		-e "/^CFLAGS=/s:=.*:=${CFLAGS}:" \
+		-e '/^LTFLAGS/s:--silent::'
 }
 
 post_install() {

Re: apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

New comment by klarasm on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1670420718

Comment:
> You can fix that by using `-e "/^CFLAGS=/s:=.*:=${CFLAGS}:"` in the vsed.

That did it, thanks!

Re: [PR PATCH] [Updated] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 731 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch
- switch to vsed
- cross-compilation fix

#### Testing the changes
- I tested the changes in this PR: I don't use this package directly

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 5132 bytes --]

From 3e78d4951d80ee92e8acdae8f751d50ed517d096 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH] apr-util: update to 1.6.3

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
- switch to vsed
- cross-compilation fix (thanks @oreo639)
---
 .../apr-util/patches/fix-cross-libtool.patch  | 22 ++++++++++
 srcpkgs/apr-util/patches/mysql.patch          | 15 -------
 srcpkgs/apr-util/template                     | 40 +++++++++----------
 3 files changed, 41 insertions(+), 36 deletions(-)
 create mode 100644 srcpkgs/apr-util/patches/fix-cross-libtool.patch
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/fix-cross-libtool.patch b/srcpkgs/apr-util/patches/fix-cross-libtool.patch
new file mode 100644
index 0000000000000..39af2fe0bcaf4
--- /dev/null
+++ b/srcpkgs/apr-util/patches/fix-cross-libtool.patch
@@ -0,0 +1,22 @@
+Taken from: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/apr-util/files/apr-util-1.6.1-libtool.patch
+
+https://bugs.gentoo.org/779487
+
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 20:20:09 -0700
+Subject: [PATCH] configure: Add missing LT_INIT
+
+This fixes the build with rlibtool which requires the generated libtool
+to determine if building shared or static libraries.
+
+--- a/configure.in
++++ b/configure.in
+@@ -8,6 +8,8 @@ AC_INIT(export_vars.sh.in)
+ AC_CONFIG_HEADER(include/private/apu_config.h)
+ AC_CONFIG_AUX_DIR(build)
+ 
++LT_INIT
++
+ sinclude(build/apu-conf.m4)
+ sinclude(build/apu-iconv.m4)
+ sinclude(build/apu-hints.m4)
diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb3..0000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 9d8090e1d7fe7..496fb7d692fcc 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,15 +1,15 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
- --with-pgsql --with-ldap
+ --with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr
  --with-expat=${XBPS_CROSS_BASE}/usr --with-gdbm=${XBPS_CROSS_BASE}/usr
  --with-sqlite3=${XBPS_CROSS_BASE}/usr --with-mysql=${XBPS_CROSS_BASE}/usr
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
-hostmakedepends="libtool apr-devel"
+hostmakedepends="libtool apr-devel automake"
 makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
 distfiles="https://archive.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
@@ -27,26 +27,24 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 pre_configure() {
-	sed -i configure \
-		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
-	if [ "$CROSS_BUILD" ]; then
-		configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
-	else
-		configure_args+=" --with-apr=/usr/bin/apr-1-config"
-	fi
+	autoreconf -fi
 }
 
 post_configure() {
 	# Hacks to make cross compiling work
-	sed -i build/rules.mk \
-		-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;--mode=link;& --tag=CC;g" \
-		-e "s;--mode=compile;& --tag=CC;g" \
-		-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
-		-e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
-		-e '/^LINK /s;$(COMPILE);$(CC);'
-
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i build/rules.mk \
+			-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;--mode=link;& --tag=CC;g" \
+			-e "s;--mode=compile;& --tag=CC;g" \
+			-e "/^CC=/s:=.*:=${CC}:"
+	fi
+	vsed -i build/rules.mk \
+		-e "/^LIBTOOL=/s;(apr_builddir);(top_builddir);" \
+		-e "s;\(top_builddir=\)\(.*\);\1${wrksrc};" \
+		-e "/^CFLAGS=/s:=.*:=${CFLAGS}:" \
+		-e '/^LTFLAGS/s:--silent::'
 }
 
 post_install() {

Re: [PR PATCH] [Updated] apr-util: update to 1.6.3

[klarasm]

[-- Attachment #1: Type: text/plain, Size: 731 bytes --]

There is an updated pull request by klarasm against master on the void-packages repository

https://github.com/klarasm/void-packages apr-util-update
https://github.com/void-linux/void-packages/pull/42636

apr-util: update to 1.6.3
Failed to download distfiles when revbumping in #41948

- update mirror
- remove upstreamed patch
- switch to vsed
- cross-compilation fix

#### Testing the changes
- I tested the changes in this PR: I don't use this package directly

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)

A patch file from https://github.com/void-linux/void-packages/pull/42636.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-apr-util-update-42636.patch --]
[-- Type: text/x-diff, Size: 5166 bytes --]

From 6fcbf1519bbd587c2b0f508606ffcf9b2b66a15f Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH] apr-util: update to 1.6.3

initially failed to download distfiles when revbumping, though that has
been fixed separately.

- remove upstreamed patch
- switch to vsed
- cross-compilation fix (thanks @oreo639)
---
 .../apr-util/patches/fix-cross-libtool.patch  | 22 ++++++++++
 srcpkgs/apr-util/patches/mysql.patch          | 15 -------
 srcpkgs/apr-util/template                     | 40 +++++++++----------
 3 files changed, 41 insertions(+), 36 deletions(-)
 create mode 100644 srcpkgs/apr-util/patches/fix-cross-libtool.patch
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/fix-cross-libtool.patch b/srcpkgs/apr-util/patches/fix-cross-libtool.patch
new file mode 100644
index 0000000000000..39af2fe0bcaf4
--- /dev/null
+++ b/srcpkgs/apr-util/patches/fix-cross-libtool.patch
@@ -0,0 +1,22 @@
+Taken from: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/apr-util/files/apr-util-1.6.1-libtool.patch
+
+https://bugs.gentoo.org/779487
+
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 20:20:09 -0700
+Subject: [PATCH] configure: Add missing LT_INIT
+
+This fixes the build with rlibtool which requires the generated libtool
+to determine if building shared or static libraries.
+
+--- a/configure.in
++++ b/configure.in
+@@ -8,6 +8,8 @@ AC_INIT(export_vars.sh.in)
+ AC_CONFIG_HEADER(include/private/apu_config.h)
+ AC_CONFIG_AUX_DIR(build)
+ 
++LT_INIT
++
+ sinclude(build/apu-conf.m4)
+ sinclude(build/apu-iconv.m4)
+ sinclude(build/apu-hints.m4)
diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb3..0000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 9d8090e1d7fe7..496fb7d692fcc 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,15 +1,15 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
- --with-pgsql --with-ldap
+ --with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr
  --with-expat=${XBPS_CROSS_BASE}/usr --with-gdbm=${XBPS_CROSS_BASE}/usr
  --with-sqlite3=${XBPS_CROSS_BASE}/usr --with-mysql=${XBPS_CROSS_BASE}/usr
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
-hostmakedepends="libtool apr-devel"
+hostmakedepends="libtool apr-devel automake"
 makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
 distfiles="https://archive.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
@@ -27,26 +27,24 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 pre_configure() {
-	sed -i configure \
-		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
-	if [ "$CROSS_BUILD" ]; then
-		configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
-	else
-		configure_args+=" --with-apr=/usr/bin/apr-1-config"
-	fi
+	autoreconf -fi
 }
 
 post_configure() {
 	# Hacks to make cross compiling work
-	sed -i build/rules.mk \
-		-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;--mode=link;& --tag=CC;g" \
-		-e "s;--mode=compile;& --tag=CC;g" \
-		-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
-		-e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
-		-e '/^LINK /s;$(COMPILE);$(CC);'
-
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i build/rules.mk \
+			-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;--mode=link;& --tag=CC;g" \
+			-e "s;--mode=compile;& --tag=CC;g" \
+			-e "/^CC=/s:=.*:=${CC}:"
+	fi
+	vsed -i build/rules.mk \
+		-e "/^LIBTOOL=/s;(apr_builddir);(top_builddir);" \
+		-e "s;\(top_builddir=\)\(.*\);\1${wrksrc};" \
+		-e "/^CFLAGS=/s:=.*:=${CFLAGS}:" \
+		-e '/^LTFLAGS/s:--silent::'
 }
 
 post_install() {

Re: apr-util: update to 1.6.3

[Emru1]

[-- Attachment #1: Type: text/plain, Size: 180 bytes --]

New comment by Emru1 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1685080065

Comment:
Is anything preventing merge in this PR?

Re: apr-util: update to 1.6.3

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 230 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/42636#issuecomment-1685205628

Comment:
That is up to the maintainers. You can try asking for a review on the IRC (politely ofc)

Re: [PR PATCH] [Merged]: apr-util: update to 1.6.3

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 550 bytes --]

There's a merged pull request on the void-packages repository

apr-util: update to 1.6.3
https://github.com/void-linux/void-packages/pull/42636

Description:
Failed to download distfiles when revbumping in #41948

- remove upstreamed patch
- switch to vsed
- cross-compilation fix

#### Testing the changes
- I tested the changes in this PR: I don't use this package directly

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for my native architecture, (x86_64-musl)