diff options
| author | Manuel Bentele | 2021-10-12 11:08:43 +0200 |
|---|---|---|
| committer | Manuel Bentele | 2021-10-12 13:12:56 +0200 |
| commit | dc0cba161eef2332e206dcf88e1be332bf10b612 (patch) | |
| tree | 09f3a8fdaa4efcd3aad56e628ad1a4313d46ddd4 | |
| parent | [looking-glass-client] Use CMake's generated install target for installation (diff) | |
| download | mltk-dc0cba161eef2332e206dcf88e1be332bf10b612.tar.gz mltk-dc0cba161eef2332e206dcf88e1be332bf10b612.tar.xz mltk-dc0cba161eef2332e206dcf88e1be332bf10b612.zip | |
[virt-viewer] Cleanup invalid environment to build other modules afterwards
| -rw-r--r-- | core/modules/virt-viewer/module.build | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/core/modules/virt-viewer/module.build b/core/modules/virt-viewer/module.build index e95d9adf..bd6ad977 100644 --- a/core/modules/virt-viewer/module.build +++ b/core/modules/virt-viewer/module.build @@ -11,6 +11,9 @@ build() { # install meson (>= 0.54.0) since packaged version is too old pip3 install "meson>=0.54.0" + # save original path content before modifying path variable + local PATH_OLD="${PATH}" + # set config paths for additional pkg-config files export PKG_CONFIG_PATH="${TARGET_BUILD_DIR}/usr/lib/x86_64-linux-gnu/pkgconfig:${TARGET_BUILD_DIR}/usr/lib64/pkgconfig" # set system root directory for prebuilt headers and libraries, e.g. libvirt-glib @@ -46,6 +49,15 @@ build() { DESTDIR="${DSTDIR}" ninja -v -C build install || perror "'ninja install' failed." rm "${SRCDIR}/pkg-config" + + # restore old environment so that following pkg-config calls are not modified + unset PKG_CONFIG_PATH + unset PKG_CONFIG_SYSROOT_DIR + unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS + unset PKG_CONFIG_ALLOW_SYSTEM_LIBS + + # restore original path variable + export PATH="${PATH_OLD}" } post_copy() { |