php iconv fix

packages/php/build.sh

@@ -5,6 +5,7 @@ TERMUX_PKG_VERSION=7.3.4
 TERMUX_PKG_SHA256=6fe79fa1f8655f98ef6708cde8751299796d6c1e225081011f4104625b923b83
 TERMUX_PKG_SRCURL=https://secure.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz
 # Build native php for phar to build (see pear-Makefile.frag.patch):
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_HOSTBUILD=true
 # Build the native php without xml support as we only need phar:
 TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="--disable-libxml --disable-dom --disable-simplexml --disable-xml --disable-xmlreader --disable-xmlwriter --without-pear"
@@ -30,7 +31,6 @@ ac_cv_func_res_nsearch=no
 --with-curl=$TERMUX_PREFIX
 --with-freetype-dir=$TERMUX_PREFIX
 --with-gd=$TERMUX_PREFIX
---without-iconv
 --with-libxml-dir=$TERMUX_PREFIX
 --with-openssl=$TERMUX_PREFIX
 --with-pcre-regex=$TERMUX_PREFIX

packages/php/iconv-config.m4.patch

@@ -0,0 +1,25 @@
+--- ./ext/iconv/config.m4.orig	2019-03-23 10:05:07.289878202 +0000
++++ ./ext/iconv/config.m4	2019-03-23 10:06:27.207978972 +0000
+@@ -12,22 +12,6 @@
+   ])
+ 
+   if test "$iconv_avail" != "no"; then
+-    if test -z "$ICONV_DIR"; then
+-      for i in /usr/local /usr; do
+-        if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
+-          PHP_ICONV_PREFIX="$i"
+-          break
+-        fi
+-      done
+-      if test -z "$PHP_ICONV_PREFIX"; then
+-        PHP_ICONV_PREFIX="/usr"
+-      fi
+-    else
+-      PHP_ICONV_PREFIX="$ICONV_DIR"
+-    fi
+-
+-    CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
+-    LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
+ 
+     if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
+       PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"