From 81a700c2792d4050896a973749af315406e1c012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 19:59:58 +0700
Subject: [PATCH 1/3] apr: remove $XBPS_CROSS_BASE cruft

---
 srcpkgs/apr/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr/template b/srcpkgs/apr/template
index aef1aae62b9..f2dc1241668 100644
--- a/srcpkgs/apr/template
+++ b/srcpkgs/apr/template
@@ -1,7 +1,7 @@
 # Template file for 'apr'
 pkgname=apr
 version=1.7.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-installbuilddir=/usr/share/apr-1/build"
 makedepends="expat-devel libuuid-devel"
@@ -42,6 +42,14 @@ pre_build() {
 	fi
 }
 
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i -e "s,$XBPS_CROSS_BASE,,g" \
+			"$DESTDIR/usr/bin/apr-1-config" \
+			"$DESTDIR/usr/share/apr-1/build/apr_rules.mk"
+	fi
+}
+
 apr-devel_package() {
 	depends="libtool libuuid-devel apr>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -53,6 +61,6 @@ apr-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.exp"
 		vmove usr/lib/pkgconfig
-		ln -sf /usr/bin/libtool ${PKGDESTDIR}/usr/share/apr-1/build/libtool
+		ln -sf ../../../bin/libtool "$PKGDESTDIR/usr/share/apr-1/build/"
 	}
 }

From 3d19b5ec329af669f3c85947ec18cfdbdf6c2f96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 20:50:36 +0700
Subject: [PATCH 2/3] apr-util: use wrapped apr-1-config

---
 srcpkgs/apr-util/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index dc1fb35b9a9..13436a674d4 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -4,7 +4,7 @@ version=1.6.1
 revision=8
 build_style=gnu-configure
 configure_args="
- --with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config --with-pgsql --with-ldap
+ --with-pgsql --with-ldap
  --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
@@ -28,6 +28,11 @@ 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
 }
 
 post_configure() {

From de8e4476342553e7bf3e512b7b3adeca5a344433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 21:46:17 +0700
Subject: [PATCH 3/3] apache: correct cross flags

Following change in apr.
---
 srcpkgs/apache/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index cc118562468..fcd6675e987 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -20,9 +20,7 @@ configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
  --enable-dav-lock --enable-vhost-alias --enable-imagemap --enable-so
  --enable-rewrite --enable-layout=XBPS --sysconfdir=/etc/${pkgname}
  --enable-mpms-shared=all --with-pcre=${XBPS_CROSS_BASE}/usr
- --with-z=${XBPS_CROSS_BASE}/usr
- --with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config
- --with-apr-util=${XBPS_CROSS_BASE}/usr/bin/apu-1-config"
+ --with-z=${XBPS_CROSS_BASE}/usr"
 conf_files="
 	/etc/${pkgname}/extra/*.conf
 	/etc/${pkgname}/httpd.conf
@@ -64,6 +62,13 @@ pre_configure() {
 		-i docs/conf/httpd.conf.in
 
 	cat ${FILESDIR}/xbps.layout >> config.layout
+	if [ "$CROSS_BUILD" ]; then
+		configure_args+=" --with-apr=$XBPS_WRAPPERDIR/apr-1-config
+		 --with-apr-util=$XBPS_WRAPPERDIR/apu-1-config"
+	else
+		configure_args+=" --with-apr=/usr/bin/apr-1-config
+		 --with-apr-util=/usr/bin/apu-1-config"
+	fi
 }
 
 post_configure() {