]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
ci: Drop handling of $PKG_CONFIG_LIBDIR
authorAndrea Bolognani <abologna@redhat.com>
Tue, 25 Feb 2020 14:41:23 +0000 (15:41 +0100)
committerAndrea Bolognani <abologna@redhat.com>
Wed, 4 Mar 2020 10:24:10 +0000 (11:24 +0100)
As of libvirt-jenkins-ci commit e41e341f0d8f, we no longer bake
this environment variable into our container images.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
ci/Makefile

index 577b130d2f790330dcbb975808fb0a0d6e5a0bb4..bc1dac11e38976255ff69b5397e5be4061b0cf2f 100644 (file)
@@ -216,15 +216,11 @@ ci-run-command@%: ci-prepare-tree
        $(CI_ENGINE) run $(CI_ENGINE_ARGS) $(CI_IMAGE_PREFIX)$*$(CI_IMAGE_TAG) \
                /bin/bash -c ' \
                $(CI_USER_HOME)/prepare || exit 1; \
-               if test "$$PKG_CONFIG_LIBDIR"; then \
-                       pkgconfig_env="PKG_CONFIG_LIBDIR=$$PKG_CONFIG_LIBDIR"; \
-               fi; \
                sudo \
                  --login \
                  --user="#$(CI_UID)" \
                  --group="#$(CI_GID)" \
                  CONFIGURE_OPTS="$$CONFIGURE_OPTS" \
-                 $$pkgconfig_env \
                  CI_CONT_SRCDIR="$(CI_CONT_SRCDIR)" \
                  CI_CONT_BUILDDIR="$(CI_CONT_BUILDDIR)" \
                  CI_SMP="$(CI_SMP)" \