diff -ur php-7.3.4/aclocal.m4 php-7.3.4+iPhone/aclocal.m4 --- php-7.3.4/aclocal.m4 2019-04-02 13:48:51.000000000 +0000 +++ php-7.3.4+iPhone/aclocal.m4 2019-05-01 14:53:45.935424715 +0000 @@ -2534,54 +2534,10 @@ dnl Common setup macro for libxml dnl AC_DEFUN([PHP_SETUP_LIBXML], [ - found_libxml=no - - dnl First try to find xml2-config - AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, - [ - for i in $PHP_LIBXML_DIR /usr/local /usr; do - if test -x "$i/bin/xml2-config"; then - ac_cv_php_xml2_config_path="$i/bin/xml2-config" - break - fi - done - ]) - - if test -x "$ac_cv_php_xml2_config_path"; then - XML2_CONFIG="$ac_cv_php_xml2_config_path" - libxml_full_version=`$XML2_CONFIG --version` - ac_IFS=$IFS - IFS="." - set $libxml_full_version - IFS=$ac_IFS - LIBXML_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3` - if test "$LIBXML_VERSION" -ge "2006011"; then - found_libxml=yes - LIBXML_LIBS=`$XML2_CONFIG --libs` - LIBXML_INCS=`$XML2_CONFIG --cflags` - else - AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.]) - fi - fi - - dnl If xml2-config fails, try pkg-config - if test "$found_libxml" = "no"; then - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - dnl If pkg-config is found try using it - if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libxml-2.0; then - if $PKG_CONFIG --atleast-version=2.6.11 libxml-2.0; then - found_libxml=yes - LIBXML_LIBS=`$PKG_CONFIG --libs libxml-2.0` - LIBXML_INCS=`$PKG_CONFIG --cflags-only-I libxml-2.0` - else - AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.]) - fi - fi - fi + found_libxml=yes + LIBXML_LIBS="-lxml2" + LIBXML_INCS="-I${PKG_ROOT:-/nonexist}/usr/include/libxml2" if test "$found_libxml" = "yes"; then PHP_EVAL_LIBLINE($LIBXML_LIBS, $1) PHP_EVAL_INCLINE($LIBXML_INCS) diff -ur php-7.3.4/ext/fileinfo/config.m4 php-7.3.4+iPhone/ext/fileinfo/config.m4 --- php-7.3.4/ext/fileinfo/config.m4 2019-04-02 13:48:51.000000000 +0000 +++ php-7.3.4+iPhone/ext/fileinfo/config.m4 2019-05-01 13:34:15.528408824 +0000 @@ -14,39 +14,9 @@ libmagic/buffer.c" AC_MSG_CHECKING([for strcasestr]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include -#include -#include - -int main(void) -{ - char *s0, *s1, *ret; - - s0 = (char *) malloc(42); - s1 = (char *) malloc(8); - - memset(s0, 'X', 42); - s0[24] = 'Y'; - s0[26] = 'Z'; - s0[41] = '\0'; - memset(s1, 'x', 8); - s1[0] = 'y'; - s1[2] = 'Z'; - s1[7] = '\0'; - - ret = strcasestr(s0, s1); - - return !(NULL != ret); -} - ]])],[ - dnl using the platform implementation - AC_MSG_RESULT(yes) - ],[ AC_MSG_RESULT(no) AC_MSG_NOTICE(using libmagic strcasestr implementation) libmagic_sources="$libmagic_sources libmagic/strcasestr.c" - ],[AC_MSG_RESULT([skipped, cross-compiling])]) PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) PHP_ADD_BUILD_DIR($ext_builddir/libmagic) diff -ur php-7.3.4/ext/iconv/config.m4 php-7.3.4+iPhone/ext/iconv/config.m4 --- php-7.3.4/ext/iconv/config.m4 2019-04-02 13:48:54.000000000 +0000 +++ php-7.3.4+iPhone/ext/iconv/config.m4 2019-05-01 13:34:15.528408824 +0000 @@ -13,7 +13,7 @@ if test "$iconv_avail" != "no"; then if test -z "$ICONV_DIR"; then - for i in /usr/local /usr; do + for i in "${PKG_ROOT}/usr"; do if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then PHP_ICONV_PREFIX="$i" break diff -ur php-7.3.4/ext/readline/config.m4 php-7.3.4+iPhone/ext/readline/config.m4 --- php-7.3.4/ext/readline/config.m4 2019-04-02 13:48:52.000000000 +0000 +++ php-7.3.4+iPhone/ext/readline/config.m4 2019-05-01 13:40:52.160420030 +0000 @@ -12,7 +12,7 @@ fi if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then - for i in $PHP_READLINE /usr/local /usr; do + for i in $PHP_READLINE; do test -f $i/include/readline/readline.h && READLINE_DIR=$i && break done @@ -76,7 +76,7 @@ elif test "$PHP_LIBEDIT" != "no"; then - for i in $PHP_LIBEDIT /usr/local /usr; do + for i in $PHP_LIBEDIT; do test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break done diff -ur php-7.3.4/ext/xml/config.m4 php-7.3.4+iPhone/ext/xml/config.m4 --- php-7.3.4/ext/xml/config.m4 2019-04-02 13:48:59.000000000 +0000 +++ php-7.3.4+iPhone/ext/xml/config.m4 2019-05-01 13:37:46.820400693 +0000 @@ -34,7 +34,7 @@ dnl Check for expat only if --with-libexpat-dir is used. dnl if test "$PHP_LIBEXPAT_DIR" != "no"; then - for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do + for i in $PHP_XML $PHP_LIBEXPAT_DIR; do if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then EXPAT_DIR=$i break diff -ur php-7.3.4/ext/xsl/config.m4 php-7.3.4+iPhone/ext/xsl/config.m4 --- php-7.3.4/ext/xsl/config.m4 2019-04-02 13:48:57.000000000 +0000 +++ php-7.3.4+iPhone/ext/xsl/config.m4 2019-05-01 13:34:15.532408824 +0000 @@ -14,49 +14,16 @@ AC_MSG_ERROR([XSL extension requires DOM extension, add --enable-dom]) fi - for i in $PHP_XSL /usr/local /usr; do - if test -x "$i/bin/xslt-config"; then - XSLT_CONFIG=$i/bin/xslt-config - break - fi - done - - if test -z "$XSLT_CONFIG"; then - AC_MSG_ERROR([xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution]) - else - libxslt_full_version=`$XSLT_CONFIG --version` - ac_IFS=$IFS - IFS="." - set $libxslt_full_version - IFS=$ac_IFS - LIBXSLT_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3` - if test "$LIBXSLT_VERSION" -ge "1001000"; then - XSL_LIBS=`$XSLT_CONFIG --libs` - XSL_INCS=`$XSLT_CONFIG --cflags` - PHP_EVAL_LIBLINE($XSL_LIBS, XSL_SHARED_LIBADD) - PHP_EVAL_INCLINE($XSL_INCS) - - AC_MSG_CHECKING([for EXSLT support]) - for i in $PHP_XSL /usr/local /usr; do - if test -r "$i/include/libexslt/exslt.h"; then + XSL_LIBS=-lxslt + XSL_INCS="${PKG_ROOT}"/usr/include/libxslt + if test -r "${PKG_ROOT}/usr/include/libexslt/exslt.h" || test -r "$PHP_XSL/usr/include/libexslt/exslt.h"; then PHP_XSL_EXSL_DIR=$i break fi - done - if test -z "$PHP_XSL_EXSL_DIR"; then - AC_MSG_RESULT(not found) - else AC_MSG_RESULT(found) PHP_ADD_LIBRARY_WITH_PATH(exslt, $PHP_XSL_EXSL_DIR/$PHP_LIBDIR, XSL_SHARED_LIBADD) PHP_ADD_INCLUDE($PHP_XSL_EXSL_DIR/include) AC_DEFINE(HAVE_XSL_EXSLT,1,[ ]) - fi - else - AC_MSG_ERROR([libxslt version 1.1.0 or greater required.]) - fi - - - fi AC_DEFINE(HAVE_XSL,1,[ ]) PHP_NEW_EXTENSION(xsl, php_xsl.c xsltprocessor.c, $ext_shared) diff -ur php-7.3.4/ext/zlib/config0.m4 php-7.3.4+iPhone/ext/zlib/config0.m4 --- php-7.3.4/ext/zlib/config0.m4 2019-04-02 13:48:52.000000000 +0000 +++ php-7.3.4+iPhone/ext/zlib/config0.m4 2019-05-01 13:39:49.992411350 +0000 @@ -19,7 +19,7 @@ ZLIB_INCDIR=$ZLIB_DIR/include fi else - for i in /usr/local /usr $PHP_ZLIB_DIR; do + for i in $PHP_ZLIB_DIR; do if test -f $i/include/zlib/zlib.h; then ZLIB_DIR=$i ZLIB_INCDIR=$i/include/zlib