buildtools-tarball: handle missing host pkg-config gracefully
PATCH v2 1/1 buildtools-tarball: handle missing host pkg-config gracefully
In reply to a message not in the archiveThe 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.
---
v2:
- extend commit message to address review comments on unclear impact of the change
meta/recipes-core/meta/buildtools-tarball.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/meta/buildtools-tarball.bb +1 -1
@@ -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'
Signature · 1 line
2.49.0
Thanks, lgtm.
Alex
Quoted 50 lines · Daniel Wagenknecht via lists.openembedded.org
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_PATHis expected to fail in some cases without this being an error.The generated environment-setup-* script might be sourced in a shell with activated
errexitoption. Prevent the expected failure of this command from being treated as an error.The only usage of the
HOST_PKG_PATHvariable 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 <[email protected]>---
v2:
- extend commit message to address review comments on unclear impact of the changemeta/recipes-core/meta/buildtools-tarball.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-core/meta/buildtools-tarball.bb +1
-2@@ -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' --2.49.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#223091): https://lists.openembedded.org/g/openembedded-core/message/223091
Mute This Topic: https://lists.openembedded.org/mt/115146660/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-