summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2016-05-28 14:26:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-01 12:38:42 +0100
commitc6e5c00d408d4109e4f7d9557ba92f471bbe178f (patch)
tree88a742f59505ef49b2545cea6a811b905d1d6041 /meta/recipes-extended/libarchive/libarchive/pkgconfig.patch
parent9d7867a054f84e6e53cff1da26f32caeec0180d6 (diff)
downloadpoky-c6e5c00d408d4109e4f7d9557ba92f471bbe178f.tar.gz
libarchive: Upgrade to v3.2.0
All patches are removed as they are no longer needed. Most were merged into this release of libarchive. "0001-Set-xattrs-after-setting-times.patch" was dropped upstream after discussion, see https://github.com/libarchive/libarchive/pull/664. The COPYING file in libarchive had a couple of minor changes to clarify which files are under which copyrights but the overall license is unaffected. (From OE-Core rev: 4976382011106b9515e44359f2f6bb1d0c69fdb3) Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/libarchive/libarchive/pkgconfig.patch')
-rw-r--r--meta/recipes-extended/libarchive/libarchive/pkgconfig.patch25
1 files changed, 0 insertions, 25 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch b/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch
deleted file mode 100644
index 346af91351..0000000000
--- a/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Use pkg-config for the libxml2 dependency, not the -config script.
2
3Upstream-Status: Pending
4
5RP 2014/5/22
6
7Index: 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)