diff options
Diffstat (limited to 'meta/recipes-extended/libarchive/libarchive/pkgconfig.patch')
-rw-r--r-- | meta/recipes-extended/libarchive/libarchive/pkgconfig.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch b/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch new file mode 100644 index 0000000000..346af91351 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Use pkg-config for the libxml2 dependency, not the -config script. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | RP 2014/5/22 | ||
6 | |||
7 | Index: libarchive-3.1.2/configure.ac | ||
8 | =================================================================== | ||
9 | --- libarchive-3.1.2.orig/configure.ac 2013-02-09 17:23:03.000000000 +0000 | ||
10 | +++ libarchive-3.1.2/configure.ac 2014-05-13 15:26:45.446499108 +0000 | ||
11 | @@ -329,10 +329,10 @@ | ||
12 | AS_HELP_STRING([--without-expat], [Don't build support for xar through expat])) | ||
13 | |||
14 | if test "x$with_xml2" != "xno"; then | ||
15 | - AC_PATH_PROG([XML2_CONFIG], [xml2-config],, [${PATH}]) | ||
16 | - if test "x$XML2_CONFIG" != "x"; then | ||
17 | - CPPFLAGS="${CPPFLAGS} `${XML2_CONFIG} --cflags`" | ||
18 | - LIBS="${LIBS} `${XML2_CONFIG} --libs`" | ||
19 | + PKG_CHECK_MODULES(PKG_XML2, [libxml-2.0],,) | ||
20 | + if test "x$PKG_XML2_CFLAGS" != "x"; then | ||
21 | + CPPFLAGS="${CPPFLAGS} ${PKG_XML2_CFLAGS}" | ||
22 | + LIBS="${LIBS} ${PKG_XML2_LIBS}" | ||
23 | AC_CHECK_LIB(xml2,xmlInitParser,[true],AC_MSG_FAILURE(Missing xml2 library)) | ||
24 | else | ||
25 | AC_CHECK_LIB(xml2,xmlInitParser) | ||