Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
Cabal
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Glasgow Haskell Compiler
Packages
Cabal
Commits
56fb1dc9
Unverified
Commit
56fb1dc9
authored
11 months ago
by
Mikolaj Konarski
Committed by
GitHub
11 months ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #9939 from haskell/mergify/bp/3.12/pr-9775
Tell zlib not to use pkg-config (backport #9775)
parents
59fd0145
527daeec
No related branches found
Branches containing commit
Tags
3.12.0+0
cabal-install-v3.12.0.0-prerelease
Tags containing commit
No related merge requests found
Pipeline
#94539
passed
10 months ago
Stage: build
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab/ci.sh
+16
-0
16 additions, 0 deletions
.gitlab/ci.sh
with
16 additions
and
0 deletions
.gitlab/ci.sh
+
16
−
0
View file @
56fb1dc9
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment