diff options
Diffstat (limited to 'meta-webserver/recipes-php/modphp/files/0001-using-pkgconfig-to-check-libxml.patch')
-rw-r--r-- | meta-webserver/recipes-php/modphp/files/0001-using-pkgconfig-to-check-libxml.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/meta-webserver/recipes-php/modphp/files/0001-using-pkgconfig-to-check-libxml.patch b/meta-webserver/recipes-php/modphp/files/0001-using-pkgconfig-to-check-libxml.patch new file mode 100644 index 000000000..bab5ff2dc --- /dev/null +++ b/meta-webserver/recipes-php/modphp/files/0001-using-pkgconfig-to-check-libxml.patch | |||
@@ -0,0 +1,74 @@ | |||
1 | [PATCH] using pkgconfig to check libxml | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Use pkg-config for the libxml2 dependency, not the -config script. | ||
6 | |||
7 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | ||
8 | --- | ||
9 | acinclude.m4 | 48 ++++++------------------------------------------ | ||
10 | 1 file changed, 6 insertions(+), 42 deletions(-) | ||
11 | |||
12 | diff --git a/acinclude.m4 b/acinclude.m4 | ||
13 | index d348f57..9f691a5 100644 | ||
14 | --- a/acinclude.m4 | ||
15 | +++ b/acinclude.m4 | ||
16 | @@ -2530,49 +2530,13 @@ dnl | ||
17 | dnl Common setup macro for libxml | ||
18 | dnl | ||
19 | AC_DEFUN([PHP_SETUP_LIBXML], [ | ||
20 | -AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, | ||
21 | -[ | ||
22 | - for i in $PHP_LIBXML_DIR /usr/local /usr; do | ||
23 | - if test -x "$i/bin/xml2-config"; then | ||
24 | - ac_cv_php_xml2_config_path="$i/bin/xml2-config" | ||
25 | - break | ||
26 | - fi | ||
27 | - done | ||
28 | -]) | ||
29 | + PKG_CHECK_MODULES(PKG_XML2, [libxml-2.0],,) | ||
30 | + if test "x$PKG_XML2_CFLAGS" != "x"; then | ||
31 | + PHP_EVAL_INCLINE($PKG_XML2_CFLAGS, $1) | ||
32 | + PHP_EVAL_LIBLINE($PKG_XML2_LIBS) | ||
33 | + AC_DEFINE(HAVE_LIBXML, 1, [ ]) | ||
34 | + $2 | ||
35 | |||
36 | - if test -x "$ac_cv_php_xml2_config_path"; then | ||
37 | - XML2_CONFIG="$ac_cv_php_xml2_config_path" | ||
38 | - libxml_full_version=`$XML2_CONFIG --version` | ||
39 | - ac_IFS=$IFS | ||
40 | - IFS="." | ||
41 | - set $libxml_full_version | ||
42 | - IFS=$ac_IFS | ||
43 | - LIBXML_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3` | ||
44 | - if test "$LIBXML_VERSION" -ge "2006011"; then | ||
45 | - LIBXML_LIBS=`$XML2_CONFIG --libs` | ||
46 | - LIBXML_INCS=`$XML2_CONFIG --cflags` | ||
47 | - PHP_EVAL_LIBLINE($LIBXML_LIBS, $1) | ||
48 | - PHP_EVAL_INCLINE($LIBXML_INCS) | ||
49 | - | ||
50 | - dnl Check that build works with given libs | ||
51 | - AC_CACHE_CHECK(whether libxml build works, php_cv_libxml_build_works, [ | ||
52 | - PHP_TEST_BUILD(xmlInitParser, | ||
53 | - [ | ||
54 | - php_cv_libxml_build_works=yes | ||
55 | - ], [ | ||
56 | - AC_MSG_RESULT(no) | ||
57 | - AC_MSG_ERROR([build test failed. Please check the config.log for details.]) | ||
58 | - ], [ | ||
59 | - [$]$1 | ||
60 | - ]) | ||
61 | - ]) | ||
62 | - if test "$php_cv_libxml_build_works" = "yes"; then | ||
63 | - AC_DEFINE(HAVE_LIBXML, 1, [ ]) | ||
64 | - fi | ||
65 | - $2 | ||
66 | - else | ||
67 | - AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.]) | ||
68 | - fi | ||
69 | ifelse([$3],[],,[else $3]) | ||
70 | fi | ||
71 | ]) | ||
72 | -- | ||
73 | 1.9.1 | ||
74 | |||