From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Ross Burton <ross.burton@arm.com>,
openembedded-core@lists.openembedded.org
Cc: schnitzeltony@gmail.com
Subject: Re: [OE-core] [PATCH] libxml2: don't override XML_CATALOG_FILES in xmllint wrapper if already set
Date: Fri, 09 Sep 2022 23:54:05 +0100 [thread overview]
Message-ID: <7dc0b18df66594ddaaaf94f94e4568e14b2a0a34.camel@linuxfoundation.org> (raw)
In-Reply-To: <20220909163640.1985612-1-ross.burton@arm.com>
On Fri, 2022-09-09 at 17:36 +0100, Ross Burton wrote:
> 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.
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
> meta/recipes-core/libxml/libxml2_2.9.14.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/libxml/libxml2_2.9.14.bb b/meta/recipes-core/libxml/libxml2_2.9.14.bb
> index 2b2289e38a6..165c92d4114 100644
> --- a/meta/recipes-core/libxml/libxml2_2.9.14.bb
> +++ b/meta/recipes-core/libxml/libxml2_2.9.14.bb
> @@ -121,7 +121,7 @@ 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}'
> }
https://autobuilder.yoctoproject.org/typhoon/#/builders/69/builds/5823/steps/24/logs/stdio
:/
Cheers,
Richard
next prev parent reply other threads:[~2022-09-09 22:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-09 16:36 [PATCH] libxml2: don't override XML_CATALOG_FILES in xmllint wrapper if already set Ross Burton
2022-09-09 16:53 ` [OE-core] " Jacob Kroon
2022-09-09 17:00 ` Ross Burton
2022-09-09 17:05 ` Jacob Kroon
2022-09-09 22:54 ` Richard Purdie [this message]
[not found] ` <17135317F9CABC3C.4025@lists.openembedded.org>
2022-09-11 22:21 ` Richard Purdie
[not found] ` <1713EE7A59F012D9.1776@lists.openembedded.org>
2022-09-12 9:43 ` Richard Purdie
2022-09-12 21:59 ` Andreas Müller
2022-09-13 17:14 ` Peter Kjellerstedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7dc0b18df66594ddaaaf94f94e4568e14b2a0a34.camel@linuxfoundation.org \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
--cc=ross.burton@arm.com \
--cc=schnitzeltony@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox