Remove dependency on php on the builder
authorFredrik Fornwall <fredrik@fornwall.net>
Thu, 24 Dec 2015 07:50:23 +0000 (02:50 -0500)
committerFredrik Fornwall <fredrik@fornwall.net>
Thu, 24 Dec 2015 07:50:23 +0000 (02:50 -0500)
The native php executable is built by the package itself

Dockerfile
packages/php/build.sh

index b560ced..0e00c28 100644 (file)
@@ -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 \
index d995b00..4cfd6c2 100644 (file)
@@ -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.