diff options
Diffstat (limited to 'package/php')
| -rw-r--r-- | package/php/Makefile | 5 | ||||
| -rw-r--r-- | package/php/patches/patch-ext_gd_libgd_gd_compat_c | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/package/php/Makefile b/package/php/Makefile index 05b97257b..f6c97d2db 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= php PKG_VERSION:= 5.4.17 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= cc698032dcdcb9ad158edcc90fe798d6 PKG_DESCR:= PHP language interpreter PKG_SECTION:= lang @@ -107,7 +107,6 @@ PKG_CONFIGURE_OPTS:= \ --without-pear \ --without-gettext \ --without-iconv \ - --without-libxml-dir \ --with-pcre-regex=no \ --with-kerberos=no @@ -201,7 +200,7 @@ else PKG_CONFIGURE_OPTS+= --disable-xml endif ifneq ($(ADK_PACKAGE_PHP_MOD_SIMPLEXML),) -PKG_CONFIGURE_OPTS+= --enable-simplexml=shared --enable-libxml +PKG_CONFIGURE_OPTS+= --enable-simplexml=shared --enable-libxml --with-libxml-dir="$(STAGING_TARGET_DIR)/usr" else PKG_CONFIGURE_OPTS+= --disable-simplexml --disable-libxml endif diff --git a/package/php/patches/patch-ext_gd_libgd_gd_compat_c b/package/php/patches/patch-ext_gd_libgd_gd_compat_c new file mode 100644 index 000000000..971de9db6 --- /dev/null +++ b/package/php/patches/patch-ext_gd_libgd_gd_compat_c @@ -0,0 +1,10 @@ +--- php-5.4.17.orig/ext/gd/libgd/gd_compat.c 2013-07-03 08:10:53.000000000 +0200 ++++ php-5.4.17/ext/gd/libgd/gd_compat.c 2013-07-17 13:09:52.000000000 +0200 +@@ -5,6 +5,7 @@ + #endif + + #ifdef HAVE_GD_JPG ++# include <stdio.h> + # include <jpeglib.h> + #endif + |