buildtools-tarball: handle missing host pkg-config gracefully

The host might not have pkg-config installed, which is OK when using the
buildtools-extended-tarball, since that contains pkg-config. So the command in
the generated environment-setup-* script for setting HOST_PKG_PATH is expected
to fail in some cases without this being an error.

The generated environment-setup-* script might be sourced in a shell with
activated `errexit` option. Prevent the expected failure of this command from
being treated as an error.

The only usage of the HOST_PKG_PATH variable is in this script and already
handles the case of the variable being empty. The variable is not exposed to
anywhere outside this script so the effects of this change are limited to this
script.

Signed-off-by: Daniel Wagenknecht <dwagenknecht@emlix.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index 02117ab84d22526e737edd6d8f66ec8f03712d1f..61b98c73872aa173eef585d37e46e065541dd07c 100644 (file)
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -73,7 +73,7 @@ create_sdk_files:append () {
        touch $script
        echo 'export PATH="${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${sbindir_nativesdk}:${SDKPATHNATIVE}${base_bindir_nativesdk}:${SDKPATHNATIVE}${base_sbindir_nativesdk}:$PATH"' >> $script
        echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
-       echo 'HOST_PKG_PATH=$(command -p pkg-config --variable=pc_path pkg-config 2>/dev/null)' >>$script
+       echo 'HOST_PKG_PATH=$(command -p pkg-config --variable=pc_path pkg-config 2>/dev/null || true)' >>$script
        echo 'export PKG_CONFIG_LIBDIR=${SDKPATHNATIVE}/${libdir}/pkgconfig:${SDKPATHNATIVE}/${datadir}/pkgconfig:${HOST_PKG_PATH:-/usr/lib/pkgconfig:/usr/share/pkgconfig}' >>$script
        echo 'unset HOST_PKG_PATH'