From 7c4ed7731c5584461d90ce74afed06e812b09d97 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Thu, 1 Jan 2015 14:36:29 +0100 Subject: [PATCH] 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 --- lang/php5/Makefile | 2 +- lang/php5/patches/800-gd-iconv.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 lang/php5/patches/800-gd-iconv.patch diff --git a/lang/php5/Makefile b/lang/php5/Makefile index e8b0e3aa3c..93dbdea236 100644 --- 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 diff --git a/lang/php5/patches/800-gd-iconv.patch b/lang/php5/patches/800-gd-iconv.patch new file mode 100644 index 0000000000..1418c276f4 --- /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 ++ ++/* force usage of internal conversation routine */ ++#undef HAVE_ICONV_H ++#undef HAVE_ICONV ++ + #if defined(HAVE_ICONV_H) || defined(HAVE_ICONV) + #include + #ifdef HAVE_ERRNO_H -- 2.30.2