diff options
| author |   Paul Barker <paul@paulbarker.me.uk> | 2016-05-28 14:26:15 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-01 08:04:12 +0100 |
| commit | 4976382011106b9515e44359f2f6bb1d0c69fdb3 (patch) | |
| tree | 7f336986038b6590e4c856c5060a005a6ed17731 /meta/recipes-extended/libarchive/libarchive/pkgconfig.patch | |
| parent | 9bffe2f9fb4ce6c0b265f27e5b484fbe076c6349 (diff) | |
| download | openembedded-core-contrib-4976382011106b9515e44359f2f6bb1d0c69fdb3.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.
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.patch | 25 |
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 @@ -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) |