diff options
author | Ross Burton <ross.burton@arm.com> | 2022-09-09 17:36:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-12 08:33:56 +0100 |
commit | fbc8f3d395711db00cae32d2502588ea9b61b1da (patch) | |
tree | c57cbc451bbe23d434086d3042ef73d9b9b61bf3 /meta/recipes-core/libxml | |
parent | ab920a779e2cd5446d6bfbb119576eb0db5c4e59 (diff) | |
download | poky-fbc8f3d395711db00cae32d2502588ea9b61b1da.tar.gz |
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]
(From OE-Core rev: a6be6d307fbe69248b4905214712d67bfddf6b92)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxml')
-rw-r--r-- | meta/recipes-core/libxml/libxml2_2.9.14.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/libxml/libxml2_2.9.14.bb b/meta/recipes-core/libxml/libxml2_2.9.14.bb index 2b2289e38a..a2ed8d71bc 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 () { | |||
121 | # Docs are not needed in the native case | 121 | # Docs are not needed in the native case |
122 | rm ${D}${datadir}/gtk-doc -rf | 122 | rm ${D}${datadir}/gtk-doc -rf |
123 | 123 | ||
124 | create_wrapper ${D}${bindir}/xmllint XML_CATALOG_FILES=${sysconfdir}/xml/catalog | 124 | create_wrapper ${D}${bindir}/xmllint 'XML_CATALOG_FILES=${XML_CATALOG_FILES:-${sysconfdir}/xml/catalog}' |
125 | } | 125 | } |
126 | do_install[vardepsexclude] += "XML_CATALOG_FILES:-${sysconfdir}/xml/catalog" | ||
126 | 127 | ||
127 | BBCLASSEXTEND = "native nativesdk" | 128 | BBCLASSEXTEND = "native nativesdk" |