lede-packages-rs

commit 7c4ed7731c5584461d90ce74afed06e812b09d97
parent 8bd80bde68474fc314f5edc435f5201fc05bbb69
Author: Michael Heimpold <mhei@heimpold.de>
Date:   Thu,  1 Jan 2015 14:36:29 +0100

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>

Diffstat:
M
lang/php5/Makefile
 | 
2
+-
A
lang/php5/patches/800-gd-iconv.patch
 | 
14
++++++++++++++

2 files changed, 15 insertions(+), 1 deletion(-)
diff --git 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
@@ -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