From 3dcf63b209d6c33f40eec481c41e1220d773d574 Mon Sep 17 00:00:00 2001
From: Juergen Buchmueller <pullmoll@t-online.de>
Date: Mon, 26 Dec 2016 16:19:21 +0100
Subject: [PATCH] apr-util: fix cross; add ODBC and FreeTDS

---
 srcpkgs/apr-util-freetds  |  1 +
 srcpkgs/apr-util-odbc     |  1 +
 srcpkgs/apr-util/template | 52 ++++++++++++++++++++++++++++++++-------
 3 files changed, 45 insertions(+), 9 deletions(-)
 create mode 120000 srcpkgs/apr-util-freetds
 create mode 120000 srcpkgs/apr-util-odbc

diff --git a/srcpkgs/apr-util-freetds b/srcpkgs/apr-util-freetds
new file mode 120000
index 00000000000..97932747b05
--- /dev/null
+++ b/srcpkgs/apr-util-freetds
@@ -0,0 +1 @@
+apr-util
\ No newline at end of file
diff --git a/srcpkgs/apr-util-odbc b/srcpkgs/apr-util-odbc
new file mode 120000
index 00000000000..97932747b05
--- /dev/null
+++ b/srcpkgs/apr-util-odbc
@@ -0,0 +1 @@
+apr-util
\ No newline at end of file
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index 5d348fc86c8..e932053b15d 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,17 +1,19 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.5.4
-revision=7
+revision=8
 build_style=gnu-configure
-# XXX: add freetds and unixodbc modules.
 configure_args="
- --with-apr=/usr --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-dbm=db53 --with-berkeley-db
- --with-crypto --with-openssl --without-odbc --without-oracle"
-hostmakedepends="apr-devel"
+ --with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config --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
+ --with-freetds=${XBPS_CROSS_BASE}/usr --with-dbm=db53 --with-crypto --with-openssl
+ --without-oracle --enable-util-dso"
+hostmakedepends="libtool apr-devel"
 makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
- gdbm-devel libldap-devel libmysqlclient-devel postgresql-libs-devel sqlite-devel"
+ gdbm-devel libldap-devel freetds-devel libmysqlclient-devel unixodbc-devel
+ postgresql-libs-devel sqlite-devel"
 short_desc="The Apache Portable Runtime Utility Library"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://apr.apache.org/"
@@ -19,7 +21,23 @@ license="Apache-2.0"
 distfiles="http://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
 checksum=a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e
 
-nocross="http://build.voidlinux.eu/builders/armv7l_builder/builds/7623/steps/shell_4/logs/stdio"
+pre_configure() {
+	sed -i configure \
+		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
+}
+
+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);'
+
+}
 
 post_install() {
 	# remove static libs
@@ -44,6 +62,14 @@ apr-util-db_package() {
 		vmove "usr/lib/apr-util-1/apr_dbm_db*"
 	}
 }
+apr-util-freetds_package() {
+	lib32disabled=yes
+	depends="apr-util-${version}_${revision}"
+	short_desc+=" - FreeTDS module"
+	pkg_install() {
+		vmove "usr/lib/apr-util-1/apr_dbd_freetds*"
+	}
+}
 apr-util-gdbm_package() {
 	lib32disabled=yes
 	depends="apr-util-${version}_${revision}"
@@ -60,6 +86,14 @@ apr-util-ldap_package() {
 		vmove "usr/lib/apr-util-1/apr_ldap*"
 	}
 }
+apr-util-odbc_package() {
+	lib32disabled=yes
+	depends="apr-util-${version}_${revision}"
+	short_desc+=" - ODBC module"
+	pkg_install() {
+		vmove "usr/lib/apr-util-1/apr_dbd_odbc*"
+	}
+}
 apr-util-mysql_package() {
 	lib32disabled=yes
 	depends="apr-util-${version}_${revision}"