diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 14:31:25 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 16:43:26 +0000 |
| commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
| tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch | |
| parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
| download | talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz talos-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip | |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch b/import-layers/yocto-poky/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch new file mode 100644 index 000000000..346af9135 --- /dev/null +++ b/import-layers/yocto-poky/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) |
