Skip to content

Commit

Permalink
Merge pull request haskell#9939 from haskell/mergify/bp/3.12/pr-9775
Browse files Browse the repository at this point in the history
Tell zlib not to use pkg-config (backport haskell#9775)
  • Loading branch information
Mikolaj authored Apr 26, 2024
2 parents 59fd014 + 527daee commit 56fb1dc
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions .gitlab/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,22 @@ if [ "$(getconf LONG_BIT)" = "32" -o "${PLATFORM:=xxx}" = "x86_64-linux-centos7"
echo 'constraints: lukko -ofd-locking' >> cabal.project.release.local
fi

# In February 2024, cabal started using zlib-0.7.0.0, which uses pkg-config by
# default. The GitLab CI environment doesn't (yet) supply pkg-config, and zlib
# does just fine without it on modern GHCs. That said, the CI environment
# probably *should* have pkg-config installed. See
# https://github.com/haskell/cabal/issues/9774.
echo 'constraints: zlib -pkg-config' >> cabal.project.release.local
# Furthermore, on Windows, zlib claims that libz is shipped with GHC, so it just
# uses @extra-libraries: z@ if pkg-config is False. If you are reading this
# comment, however, this didn't work. Thus we switch to using the bundled libz,
# as was done in zlib <0.7.0.0.
case "$(uname)" in
MSYS_*|MINGW*)
echo 'constraints: zlib +bundled-c-zlib' >> cabal.project.release.local
;;
esac

args=(
--disable-profiling
--enable-executable-stripping
Expand Down

0 comments on commit 56fb1dc

Please sign in to comment.