From: Ross Burton Date: Fri, 9 Sep 2022 16:36:40 +0000 (+0100) Subject: libxml2: don't override XML_CATALOG_FILES in xmllint wrapper if already set X-Git-Tag: 2022-10~130 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6be6d307fbe69248b4905214712d67bfddf6b92;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git libxml2: don't override XML_CATALOG_FILES in xmllint wrapper if already set The KDE build uses custom catalogs by setting XML_CATALOG_FILES, so this wrapper should not override that value if it has already been set. [RP: Add vardepsexclude since bitbake stores the expanded version of the variable name in the siginfo data which would expand to a full build path in the native case] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/libxml/libxml2_2.9.14.bb b/meta/recipes-core/libxml/libxml2_2.9.14.bb index 2b2289e38a6..a2ed8d71bc1 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.14.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.14.bb @@ -121,7 +121,8 @@ do_install:append:class-native () { # Docs are not needed in the native case rm ${D}${datadir}/gtk-doc -rf - create_wrapper ${D}${bindir}/xmllint XML_CATALOG_FILES=${sysconfdir}/xml/catalog + create_wrapper ${D}${bindir}/xmllint 'XML_CATALOG_FILES=${XML_CATALOG_FILES:-${sysconfdir}/xml/catalog}' } +do_install[vardepsexclude] += "XML_CATALOG_FILES:-${sysconfdir}/xml/catalog" BBCLASSEXTEND = "native nativesdk"