diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-05-21 06:38:49 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-05-21 06:40:59 +0000 |
| commit | 531fe443dc2a4e4bc06eb0723e623831a80c139b (patch) | |
| tree | b7b1b6934284a3144d96d2601de44860430ed3b1 /main/php/gd-iconv.patch | |
| parent | b565b018e4591f5fb1bd76275c347cfce8076212 (diff) | |
| download | aports-531fe443dc2a4e4bc06eb0723e623831a80c139b.tar.bz2 aports-531fe443dc2a4e4bc06eb0723e623831a80c139b.tar.xz | |
main/php: link gd extension to libiconv
ref #1916
Diffstat (limited to 'main/php/gd-iconv.patch')
| -rw-r--r-- | main/php/gd-iconv.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/main/php/gd-iconv.patch b/main/php/gd-iconv.patch new file mode 100644 index 0000000000..ed7384ee9d --- /dev/null +++ b/main/php/gd-iconv.patch @@ -0,0 +1,47 @@ +diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 +index 0e35ece..3593cd7 100644 +--- a/ext/gd/config.m4 ++++ b/ext/gd/config.m4 +@@ -6,6 +6,9 @@ dnl + dnl Configure options + dnl + ++PHP_ARG_WITH(iconv-dir, iconv dir for GD and XMLRPC-EPI, ++[ --with-iconv-dir=DIR GD/XMLRPC-EPI: iconv dir for GD/XMLRPC-EPI],no,no) ++ + PHP_ARG_WITH(gd, for GD support, + [ --with-gd[=DIR] Include GD support. DIR is the GD library base + install directory [BUNDLED]]) +@@ -374,6 +377,18 @@ dnl enable the support in bundled GD library + GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208" + fi + ++ dnl link to iconv if needed ++ if test "$PHP_ICONV_DIR" != "no"; then ++ PHP_ICONV=$PHP_ICONV_DIR ++ fi ++ ++ if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then ++ PHP_ICONV=yes ++ fi ++ ++ PHP_SETUP_ICONV(GD_SHARED_LIBADD, [], [ ++ AC_MSG_ERROR([iconv not found, in order to build gd you need the iconv library]) ++ ]) + else + + if test "$PHP_GD" != "no"; then +diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 +index 389d4ad..a12575b 100644 +--- a/ext/xmlrpc/config.m4 ++++ b/ext/xmlrpc/config.m4 +@@ -18,9 +18,6 @@ fi + PHP_ARG_WITH(libexpat-dir, libexpat dir for XMLRPC-EPI, + [ --with-libexpat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)],no,no) + +-PHP_ARG_WITH(iconv-dir, iconv dir for XMLRPC-EPI, +-[ --with-iconv-dir=DIR XMLRPC-EPI: iconv dir for XMLRPC-EPI],no,no) +- + if test "$PHP_XMLRPC" != "no"; then + + PHP_ADD_EXTENSION_DEP(xmlrpc, libxml) |