apache2: Fix quick build
This commit is contained in:
parent
251e4ccd18
commit
06df346576
@ -1,14 +0,0 @@
|
||||
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 $?
|
||||
|
@ -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=1
|
||||
TERMUX_PKG_REVISION=2
|
||||
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"
|
||||
|
13
packages/apache2/configure.patch
Normal file
13
packages/apache2/configure.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff -u -r ../httpd-2.4.38/configure ./configure
|
||||
--- ../httpd-2.4.38/configure 2019-01-17 18:46:19.000000000 +0000
|
||||
+++ ./configure 2019-03-17 23:05:48.786527661 +0000
|
||||
@@ -6401,7 +6401,7 @@
|
||||
LTFLAGS='--silent'
|
||||
fi
|
||||
my_libtool=`$apr_config --apr-libtool`
|
||||
- LIBTOOL="$my_libtool \$(LTFLAGS)"
|
||||
+ LIBTOOL="bash $my_libtool \$(LTFLAGS)"
|
||||
- libtoolversion=`$my_libtool --version`
|
||||
+ libtoolversion=`bash $my_libtool --version`
|
||||
case $libtoolversion in
|
||||
*1.[45]* | *[2-9].[0-9]*)
|
Loading…
Reference in New Issue
Block a user