From: Fredrik Fornwall Date: Thu, 24 Dec 2015 07:50:23 +0000 (-0500) Subject: Remove dependency on php on the builder X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/7e606cc7eb950c60860368d81e60a66f7b93dad7 Remove dependency on php on the builder The native php executable is built by the package itself --- diff --git a/Dockerfile b/Dockerfile index b560ced4..0e00c287 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,8 +36,6 @@ RUN apt-get update && apt-get install -y \ luarocks \ lzip \ m4 \ -# php-cli is needed to compile php package - php5-cli \ pkg-config \ scons \ subversion \ diff --git a/packages/php/build.sh b/packages/php/build.sh index d995b008..4cfd6c2a 100644 --- a/packages/php/build.sh +++ b/packages/php/build.sh @@ -20,6 +20,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_res_nsearch=no" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --mandir=$TERMUX_PREFIX/share/man" termux_step_pre_configure () { + export PATH=$PATH:$TERMUX_PKG_HOSTBUILD_DIR/sapi/cli/ export NATIVE_PHP_EXECUTABLE=$TERMUX_PKG_HOSTBUILD_DIR/sapi/cli/php # Run autoconf since we have patched config.m4 files.