From 251e4ccd1804e143fe7b7f43a6b338e2137c3703 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 17 Mar 2019 23:37:13 +0100
Subject: [PATCH] apache2: Patch package for easier cross-compiling

---
 packages/apache2/build-instdso.sh.patch | 14 ++++++++++++++
 packages/apache2/build.sh               |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 packages/apache2/build-instdso.sh.patch

diff --git a/packages/apache2/build-instdso.sh.patch b/packages/apache2/build-instdso.sh.patch
new file mode 100644
index 000000000..57f613763
--- /dev/null
+++ b/packages/apache2/build-instdso.sh.patch
@@ -0,0 +1,14 @@
+diff -u -r ../httpd-2.4.38/build/instdso.sh ./build/instdso.sh
+--- ../httpd-2.4.38/build/instdso.sh	2011-03-04 18:58:38.000000000 +0000
++++ ./build/instdso.sh	2019-03-17 22:34:44.701332303 +0000
+@@ -58,7 +58,9 @@
+         ;;
+ esac
+ 
+-CMD="$SH_LIBTOOL --mode=install $INSTALL_CMD $DSOARCHIVE $TARGETDIR/"
++# Adding sh below simplifies cross compiling setup where $SH_LIBTOOL
++# may have wrong shebang:
++CMD="sh $SH_LIBTOOL --mode=install $INSTALL_CMD $DSOARCHIVE $TARGETDIR/"
+ echo $CMD
+ $CMD || exit $?
+ 
diff --git a/packages/apache2/build.sh b/packages/apache2/build.sh
index f98e4116f..4169640d9 100644
--- a/packages/apache2/build.sh
+++ b/packages/apache2/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://httpd.apache.org
 TERMUX_PKG_DESCRIPTION="Apache Web Server"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_VERSION=2.4.38
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=7dc65857a994c98370dc4334b260101a7a04be60e6e74a5c57a6dee1bc8f394a
 TERMUX_PKG_SRCURL=https://www.apache.org/dist/httpd/httpd-$TERMUX_PKG_VERSION.tar.bz2
 TERMUX_PKG_DEPENDS="apr, apr-util, pcre, openssl, libcrypt, libandroid-support, libnghttp2, libexpat, libuuid"