php5: gd: do not link against libiconv (fixes #706)

This commit adds a patch to enforce the usage of an alternative
code path, preventing the need of libiconv in the bundled libgd
of php.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index e8b0e3aa3c266400aee4212f3ce6cf6889d6eaa9..93dbdea23688358a5ca2787342d8c8bb0a934e90 100644 (file)
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
 PKG_VERSION:=5.4.36
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 

diff --git a/lang/php5/patches/800-gd-iconv.patch b/lang/php5/patches/800-gd-iconv.patch
new file mode 100644 (file)
index 0000000..1418c27
--- /dev/null
+++ b/lang/php5/patches/800-gd-iconv.patch
@@ -0,0 +1,14 @@
+--- a/ext/gd/libgd/gdkanji.c
++++ b/ext/gd/libgd/gdkanji.c
+@@ -9,6 +9,11 @@
+ #include "gdhelpers.h"
+ 
+ #include <stdarg.h>
++
++/* force usage of internal conversation routine */
++#undef HAVE_ICONV_H
++#undef HAVE_ICONV
++
+ #if defined(HAVE_ICONV_H) || defined(HAVE_ICONV)
+ #include <iconv.h>
+ #ifdef HAVE_ERRNO_H