mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
libarchive: Use pkg-config for libxml2 dependency
(From OE-Core rev: fe277bf0a61d5d7787dba699ee1ed4d979ba5cff) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -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)
|
||||||
@@ -28,6 +28,7 @@ PACKAGECONFIG[lzo] = "--with-lzo2,--without-lzo2,lzo,"
|
|||||||
|
|
||||||
SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
|
SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
|
||||||
file://libarchive-CVE-2013-0211.patch \
|
file://libarchive-CVE-2013-0211.patch \
|
||||||
|
file://pkgconfig.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "efad5a503f66329bb9d2f4308b5de98a"
|
SRC_URI[md5sum] = "efad5a503f66329bb9d2f4308b5de98a"
|
||||||
|
|||||||
Reference in New Issue
Block a user