php: Bump version to 5.6.21, depend on libgd

diff --git a/packages/php/build.sh b/packages/php/build.sh
index 5f76471fd2455ebe7b138bd2739ab42476c81704..70944e95d138ff985c1ec1e7c1e04f1370afac04 100644 (file)
--- a/packages/php/build.sh
+++ b/packages/php/build.sh
@@ -1,13 +1,11 @@
 TERMUX_PKG_HOMEPAGE=http://php.net/
 TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
-TERMUX_PKG_VERSION=5.6.20
-TERMUX_PKG_BUILD_REVISION=2
-TERMUX_PKG_SRCURL=http://php.net/get/php-${TERMUX_PKG_VERSION}.tar.xz/from/this/mirror
-TERMUX_PKG_NO_SRC_CACHE=yes # Caching with filename does not work for 'mirror'
+TERMUX_PKG_VERSION=5.6.21
+TERMUX_PKG_SRCURL=http://mirror.internode.on.net/pub/php/php-${TERMUX_PKG_VERSION}.tar.xz
 # Build native php for phar to build (see pear-Makefile.frag.patch):
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_FOLDERNAME=php-${TERMUX_PKG_VERSION}
-TERMUX_PKG_DEPENDS="libandroid-glob, libxml2, liblzma, openssl, pcre, libcrypt, libmcrypt, libcurl"
+TERMUX_PKG_DEPENDS="libandroid-glob, libxml2, liblzma, openssl, pcre, libcrypt, libmcrypt, libcurl, libgd"
 # http://php.net/manual/en/libxml.installation.php
 # "If configure cannot find xml2-config in the directory specified by --with-libxml-dir,
 # then it'll continue on and check the default locations."

diff --git a/packages/php/ext-mcrypt-config.m4.patch b/packages/php/ext-mcrypt-config.m4.patch
new file mode 100644 (file)
index 0000000..19a7d71
--- /dev/null
+++ b/packages/php/ext-mcrypt-config.m4.patch
@@ -0,0 +1,32 @@
+Avoid linking to libltdl.so (no longer needed)
+
+diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
+index cc68d86..8ae7ee8 100644
+--- a/ext/mcrypt/config.m4
++++ b/ext/mcrypt/config.m4
+@@ -34,21 +34,13 @@ if test "$PHP_MCRYPT" != "no"; then
+ 
+   PHP_MCRYPT_CHECK_VERSION
+ 
+-  PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open, 
++  PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open,
+   [
+-    PHP_ADD_LIBRARY(ltdl,, MCRYPT_SHARED_LIBADD)
+     AC_DEFINE(HAVE_LIBMCRYPT,1,[ ])
+   ],[
+-    PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open,
+-    [
+-      AC_DEFINE(HAVE_LIBMCRYPT,1,[ ])
+-    ],[
+-      AC_MSG_ERROR([Sorry, I was not able to diagnose which libmcrypt version you have installed.])
+-    ],[
+-      -L$MCRYPT_DIR/$PHP_LIBDIR
+-    ])
++    AC_MSG_ERROR([Sorry, I was not able to diagnose which libmcrypt version you have installed.])
+   ],[
+-    -L$MCRYPT_DIR/$PHP_LIBDIR -lltdl
++    -L$MCRYPT_DIR/$PHP_LIBDIR
+   ])
+ 
+   PHP_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/$PHP_LIBDIR, MCRYPT_SHARED_LIBADD)
+