From: Andrea Bolognani <abologna@redhat.com>
Date: Tue, 25 Feb 2020 14:41:23 +0000 (+0100)
Subject: ci: Drop handling of $PKG_CONFIG_LIBDIR
X-Git-Tag: v6.2.0-rc1~312
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=507724c3558009a7c547995508d778638c32faa1;p=thirdparty%2Flibvirt.git

ci: Drop handling of $PKG_CONFIG_LIBDIR

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>
---

diff --git a/ci/Makefile b/ci/Makefile
index 577b130d2f..bc1dac11e3 100644
--- a/ci/Makefile
+++ b/ci/Makefile
@@ -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)" \