From 902260f6daa6e86335a7d5ad1c91cd2d27c0610c Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Mon, 8 Aug 2022 21:21:18 +0000 Subject: [PATCH] gitlab-ci: Install pkg-config on FreeBSD Without this change the autotools build system fails to find glib and reports an error. The CMake build worked prior to this change since CMake has fallback logic to find glib even without pkg-config. --- .gitlab-ci.yml | 2 +- tools/ci-install.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e44b47dc7..26ef75371 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,7 +72,7 @@ variables: BUILD_OS: freebsd BUILD_ARCH: "x86_64" FDO_DISTRIBUTION_VERSION: '13.0' - FDO_DISTRIBUTION_TAG: '2022-08-08.0' # Bump this version on every ci-install.sh change + FDO_DISTRIBUTION_TAG: '2022-08-08.1' # Bump this version on every ci-install.sh change FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH" .cmake-common: diff --git a/tools/ci-install.sh b/tools/ci-install.sh index c507ea3c1..328bb5c7e 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -323,6 +323,7 @@ case "$ci_distro" in libtool libX11 libxslt + pkgconf xmlto ) $sudo pkg install -y "${packages[@]}" -- 2.47.3