diff options
| author | Alex Richardson <arichardson@FreeBSD.org> | 2022-08-08 21:21:18 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-08-10 11:18:20 +0000 |
| commit | 902260f6daa6e86335a7d5ad1c91cd2d27c0610c (patch) | |
| tree | d835d9518e9a45deb9aa41f2ca37e6417b9f262b | |
| parent | d67132d3d033dc609eef8dd7ea2a3f10825633e0 (diff) | |
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.
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | tools/ci-install.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e44b47dc..26ef7537 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 c507ea3c..328bb5c7 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[@]}" |