diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2014-05-15 08:08:23 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2014-05-15 08:08:23 +0000 |
| commit | 59476aaaf826a33232db4de74c9028552ad985e6 (patch) | |
| tree | 0695098dd89006c0172a68c800a10298e4f7b3ba /net | |
| parent | 972788ff11dac55e56a7f10117283e44214bd8f6 (diff) | |
| download | ports-59476aaaf826a33232db4de74c9028552ad985e6.tar.gz ports-59476aaaf826a33232db4de74c9028552ad985e6.zip | |
Fix build of xmlrpc extension.
Notes
Notes:
svn path=/head/; revision=354103
Diffstat (limited to 'net')
| -rw-r--r-- | net/php5-xmlrpc/files/patch-config.m4 | 23 | ||||
| -rw-r--r-- | net/php55-xmlrpc/files/patch-config.m4 | 23 |
2 files changed, 46 insertions, 0 deletions
diff --git a/net/php5-xmlrpc/files/patch-config.m4 b/net/php5-xmlrpc/files/patch-config.m4 new file mode 100644 index 000000000000..098855a191dd --- /dev/null +++ b/net/php5-xmlrpc/files/patch-config.m4 @@ -0,0 +1,23 @@ +--- config.m4.orig 2014-05-15 08:00:57.801291749 +0000 ++++ config.m4 2014-05-15 08:01:40.161014307 +0000 +@@ -61,11 +61,9 @@ + fi + fi + +- dnl if iconv is shared or missing then we should build iconv ourselves +- if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then +- + if test "$PHP_ICONV_DIR" != "no"; then + PHP_ICONV=$PHP_ICONV_DIR ++ PHP_ADD_INCLUDE($PHP_ICONV_DIR/include) + fi + + if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then +@@ -75,7 +73,6 @@ + PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ + AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) + ]) +- fi + fi + + if test "$PHP_XMLRPC" = "yes"; then diff --git a/net/php55-xmlrpc/files/patch-config.m4 b/net/php55-xmlrpc/files/patch-config.m4 new file mode 100644 index 000000000000..d2dc85f26a48 --- /dev/null +++ b/net/php55-xmlrpc/files/patch-config.m4 @@ -0,0 +1,23 @@ +--- config.m4.orig 2014-04-29 08:04:30.000000000 +0000 ++++ config.m4 2014-05-15 08:04:00.883004682 +0000 +@@ -61,11 +61,9 @@ if test "$PHP_XMLRPC" != "no"; then + fi + fi + +- dnl if iconv is shared or missing then we should build iconv ourselves +- if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then +- + if test "$PHP_ICONV_DIR" != "no"; then + PHP_ICONV=$PHP_ICONV_DIR ++ PHP_ADD_INCLUDE($PHP_ICONV_DIR/include) + fi + + if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then +@@ -75,7 +73,6 @@ if test "$PHP_XMLRPC" != "no"; then + PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ + AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) + ]) +- fi + fi + + if test "$PHP_XMLRPC" = "yes"; then |