From 8b025a7a4347242cfcb2d5567fef5475d1e46593 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 18 Mar 2019 00:51:48 +0100 Subject: [PATCH] apache2: Enable fast-building php --- packages/apache2/build-instdso.sh.patch | 16 ++++++++++++++++ packages/apache2/build.sh | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) 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..e4721f5d4 --- /dev/null +++ b/packages/apache2/build-instdso.sh.patch @@ -0,0 +1,16 @@ +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 23:43:43.407027928 +0000 +@@ -59,6 +59,12 @@ + esac + + CMD="$SH_LIBTOOL --mode=install $INSTALL_CMD $DSOARCHIVE $TARGETDIR/" ++# Prefixing with bash below simplifies cross compiling setup where ++# $SH_LIBTOOL may have wrong shebang: ++case "$SH_LIBTOOL" in ++ bash*) ;; ++ *) CMD="bash $CMD" ;; ++esac + echo $CMD + $CMD || exit $? + diff --git a/packages/apache2/build.sh b/packages/apache2/build.sh index 7284e6f13..20e3a2c9a 100644 --- a/packages/apache2/build.sh +++ b/packages/apache2/build.sh @@ -2,7 +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=2 +TERMUX_PKG_REVISION=3 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"