From 22ecf2243832b96f6ba630a7a7942fe4479a46f7 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 18 Nov 2021 08:27:40 +0100 Subject: [PATCH] apache2: compile host tool in termux_step_host_build Instead of in termux_step_post_configure. --- packages/apache2/build.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/apache2/build.sh b/packages/apache2/build.sh index bdc9133da..5a4a99dff 100644 --- a/packages/apache2/build.sh +++ b/packages/apache2/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Apache Web Server" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=1:2.4.51 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.apache.org/dist/httpd/httpd-${TERMUX_PKG_VERSION:2}.tar.bz2 TERMUX_PKG_SHA256=20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4 TERMUX_PKG_DEPENDS="apr, apr-util, pcre, openssl, libcrypt, libandroid-support, libnghttp2, libexpat, libuuid, zlib" @@ -72,7 +73,12 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_RM_AFTER_INSTALL="share/apache2/manual etc/apache2/original share/man/man8/suexec.8 libexec/httpd.exp" TERMUX_PKG_EXTRA_MAKE_ARGS="-s" TERMUX_PKG_SERVICE_SCRIPT=("httpd" 'exec httpd -DNO_DETACH 2>&1') +TERMUX_PKG_HOSTBUILD=true +termux_step_host_build() { + gcc -O2 -DCROSS_COMPILE $TERMUX_PKG_SRCDIR/server/gen_test_char.c \ + -o gen_test_char +} termux_step_pre_configure() { # Certain packages are not safe to build on device because their @@ -98,8 +104,8 @@ termux_step_pre_configure() { } termux_step_post_configure() { - # thanks to @JetBalsa - gcc -O2 -DCROSS_COMPILE $TERMUX_PKG_SRCDIR/server/gen_test_char.c -o $TERMUX_PKG_BUILDDIR/server/gen_test_char + install -m700 $TERMUX_PKG_HOSTBUILD_DIR/gen_test_char \ + $TERMUX_PKG_BUILDDIR/server/gen_test_char touch -d "1 hour" $TERMUX_PKG_BUILDDIR/server/gen_test_char }