[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 14 commits: Use Cabal 3.10 for Hadrian

Thu Sep 21 09:24:34 UTC 2023

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC

Commits:
c8bbfa84 by John Ericson at 2023-09-21T05:24:07-04:00
Use Cabal 3.10 for Hadrian

We need the newer version for `CABAL_FLAG_*` env vars for #17191.

- - - - -
82781870 by John Ericson at 2023-09-21T05:24:07-04:00
hadrian: `need` any `configure` script we will call

When the script is changed, we should reconfigure.

- - - - -
e8b3d179 by John Ericson at 2023-09-21T05:24:07-04:00
hadrian: Make it easier to debug Cabal configure

Right now, output is squashed. This make per-package configure scripts
extremely hard to maintain, because we get vague "library is missing"
errors when the actually probably is usually completely unrelated except
for also involving the C/C++ toolchain.

(I can always pass `-VVV` to Hadrian locally, but these errors are
subtle and I often cannot reproduce them locally!)

`--disable-option-checking` was added back in
75c6e0684dda585c37b4ac254cd7a13537a59a91 but seems to be a bit overkill;
if other flags are passed that are not recognized behind the two from
Cabal mentioned in the former comment, we *do* want to know about it.

- - - - -
a06ff022 by John Ericson at 2023-09-21T05:24:07-04:00
hadrian: Increase verbosity of certain cabal commands

This is a hack to get around the cabal function we're calling
*decreasing* the verbosity it passes to another function, which is the
stuff we often actually care about. Sigh.

Keeping this a separate commit so if this makes things too verbose it is
easy to revert.

- - - - -
5caaadbe by John Ericson at 2023-09-21T05:24:07-04:00
rts: Move most external symbols logic to the configure script

This is much more terse because we are programmatically handling the
leading underscore.

`findPtr` however is still handled in the Cabal file because we need a
newer Cabal to pass flags to the configure script automatically.

Co-Authored-By: Ben Gamari <ben at well-typed.com>

- - - - -
86e2511c by Bodigrim at 2023-09-21T05:24:10-04:00
Bump Cabal submodule to allow text-2.1 and bytestring-0.12

- - - - -
7bafdde8 by Matthew Pickering at 2023-09-21T05:24:10-04:00
hadrian: Generate Distribution/Fields/Lexer.x before creating a source-dist

- - - - -
748d6f64 by Bodigrim at 2023-09-21T05:24:10-04:00
Bump hadrian's index-state to upgrade alex at least to 3.2.7.3

- - - - -
322f93c5 by Luite Stegeman at 2023-09-21T05:24:12-04:00
JS: correct file size and times

Programs produced by the JavaScript backend were returning
incorrect file sizes and modification times, causing cabal
related tests to fail.

This fixes the problem and adds an additional test that verifies
basic file information operations.

fixes #23980

- - - - -
863abbaa by Ben Gamari at 2023-09-21T05:24:12-04:00
gitlab-ci: Drop libiserv from upload_ghc_libs

libiserv has been merged into the ghci package.

- - - - -
d0dd319b by Ben Gamari at 2023-09-21T05:24:12-04:00
testsuite: Fix Windows line endings

- - - - -
54cd665d by Ben Gamari at 2023-09-21T05:24:12-04:00
testsuite: Use makefile_test

- - - - -
422d7469 by Ben Gamari at 2023-09-21T05:24:13-04:00
system-cxx-std-lib: Add license and description
- - - - -
cceeeba4 by Ben Gamari at 2023-09-21T05:24:13-04:00
gitlab/issue-templates: Rename bug.md -> default.md

So that it is visible by default.

- - - - -

30 changed files:

- .gitlab/issue_templates/bug.md → .gitlab/issue_templates/default.md
- .gitlab/rel_eng/upload_ghc_libs.py
- hadrian/bootstrap/plan-9_4_1.json
- hadrian/bootstrap/plan-9_4_2.json
- hadrian/bootstrap/plan-9_4_3.json
- hadrian/bootstrap/plan-9_4_4.json
- hadrian/bootstrap/plan-9_4_5.json
- hadrian/bootstrap/plan-9_6_1.json
- hadrian/bootstrap/plan-9_6_2.json
- hadrian/bootstrap/plan-bootstrap-9_4_1.json
- hadrian/bootstrap/plan-bootstrap-9_4_2.json
- hadrian/bootstrap/plan-bootstrap-9_4_3.json
- hadrian/bootstrap/plan-bootstrap-9_4_4.json
- hadrian/bootstrap/plan-bootstrap-9_4_5.json
- hadrian/bootstrap/plan-bootstrap-9_6_1.json
- hadrian/bootstrap/plan-bootstrap-9_6_2.json
- hadrian/cabal.project
- hadrian/hadrian.cabal
- hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
- hadrian/src/Hadrian/Oracles/Cabal/Rules.hs
- hadrian/src/Rules/SourceDist.hs
- hadrian/src/Settings/Builders/Cabal.hs
- hadrian/stack.yaml
- hadrian/stack.yaml.lock
- libraries/Cabal
- libraries/base/configure.ac
- libraries/base/jsbits/base.js
- mk/system-cxx-std-lib-1.0.conf.in
- rts/.gitignore
- rts/configure.ac

The diff was not included because it is too large.

View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/080f79db3dd63f31ab0adfc6f5902cbcdc89c720...cceeeba4bb22fec54ad7166bf66feebe52e12dc1

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/080f79db3dd63f31ab0adfc6f5902cbcdc89c720...cceeeba4bb22fec54ad7166bf66feebe52e12dc1
You're receiving this email because of your account on gitlab.haskell.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230921/cb4eb185/attachment-0001.html>