aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libarchive/libarchive
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-22 10:55:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-28 08:23:57 +0100
commitfe277bf0a61d5d7787dba699ee1ed4d979ba5cff (patch)
treecc2bce37e5300a022f28c349f64a4b8c6b23e328 /meta/recipes-extended/libarchive/libarchive
parent4a971a90988435902a4a8dd9c721d440cd80c0bd (diff)
downloadopenembedded-core-contrib-fe277bf0a61d5d7787dba699ee1ed4d979ba5cff.tar.gz
openembedded-core-contrib-fe277bf0a61d5d7787dba699ee1ed4d979ba5cff.tar.bz2
openembedded-core-contrib-fe277bf0a61d5d7787dba699ee1ed4d979ba5cff.zip
libarchive: Use pkg-config for libxml2 dependency
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/libarchive/libarchive')
-rw-r--r--meta/recipes-extended/libarchive/libarchive/pkgconfig.patch25
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 @@
+Use pkg-config for the libxml2 dependency, not the -config script.
+
+Upstream-Status: Pending
+
+RP 2014/5/22
+
+Index: libarchive-3.1.2/configure.ac
+===================================================================
+--- libarchive-3.1.2.orig/configure.ac 2013-02-09 17:23:03.000000000 +0000
++++ libarchive-3.1.2/configure.ac 2014-05-13 15:26:45.446499108 +0000
+@@ -329,10 +329,10 @@
+ AS_HELP_STRING([--without-expat], [Don't build support for xar through expat]))
+
+ if test "x$with_xml2" != "xno"; then
+- AC_PATH_PROG([XML2_CONFIG], [xml2-config],, [${PATH}])
+- if test "x$XML2_CONFIG" != "x"; then
+- CPPFLAGS="${CPPFLAGS} `${XML2_CONFIG} --cflags`"
+- LIBS="${LIBS} `${XML2_CONFIG} --libs`"
++ PKG_CHECK_MODULES(PKG_XML2, [libxml-2.0],,)
++ if test "x$PKG_XML2_CFLAGS" != "x"; then
++ CPPFLAGS="${CPPFLAGS} ${PKG_XML2_CFLAGS}"
++ LIBS="${LIBS} ${PKG_XML2_LIBS}"
+ AC_CHECK_LIB(xml2,xmlInitParser,[true],AC_MSG_FAILURE(Missing xml2 library))
+ else
+ AC_CHECK_LIB(xml2,xmlInitParser)