cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build of xmlrpc extension.

Browse Source
This commit is contained in:
Alex Dupre 2014-05-15 08:08:23 +00:00
parent 972788ff11
commit 59476aaaf8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=354103
4 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/php5/Makefile.ext
View File

@ -427,7 +427,7 @@ CONFIGURE_ARGS+=--with-xmlrpc \
--with-libxml-dir=${LOCALBASE} \
--with-iconv-dir=${LOCALBASE}
USES+= iconv::translit
USES+= iconv:translit
USE_GNOME= libxml2
PHP_HEADER_DIRS=libxmlrpc

2
lang/php55/Makefile.ext
View File

@ -431,7 +431,7 @@ CONFIGURE_ARGS+=--with-xmlrpc \
--with-libxml-dir=${LOCALBASE} \
--with-iconv-dir=${LOCALBASE}
USES+= iconv::translit
USES+= iconv:translit
USE_GNOME= libxml2
PHP_HEADER_DIRS=libxmlrpc

23
net/php5-xmlrpc/files/patch-config.m4 Normal file
View File

@ -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

23
net/php55-xmlrpc/files/patch-config.m4 Normal file
View File

@ -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