[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 15 commits: Drop dependence on `touch`

Thu Sep 21 06:03:44 UTC 2023

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

Commits:
9e865560 by Ben Gamari at 2023-09-21T02:03:33-04:00
Drop dependence on `touch`

This drops GHC's dependence on the `touch` program, instead implementing
it within GHC. This eliminates an external dependency and means that we
have one fewer program to keep track of in the `configure` script

- - - - -
54c4f550 by John Ericson at 2023-09-21T02:03:34-04:00
Use Cabal 3.10 for Hadrian

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

- - - - -
01a16b0e by John Ericson at 2023-09-21T02:03:34-04:00
hadrian: `need` any `configure` script we will call

When the script is changed, we should reconfigure.

- - - - -
4e465819 by John Ericson at 2023-09-21T02:03:34-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.

- - - - -
f1490af4 by John Ericson at 2023-09-21T02:03:34-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.

- - - - -
88d04a9d by John Ericson at 2023-09-21T02:03:34-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>

- - - - -
1c8e4388 by Bodigrim at 2023-09-21T02:03:36-04:00
Bump Cabal submodule to allow text-2.1 and bytestring-0.12

- - - - -
d8fd35c5 by Matthew Pickering at 2023-09-21T02:03:36-04:00
hadrian: Generate Distribution/Fields/Lexer.x before creating a source-dist

- - - - -
45426597 by Bodigrim at 2023-09-21T02:03:36-04:00
Bump hadrian's index-state to upgrade alex at least to 3.2.7.3

- - - - -
277ac964 by Luite Stegeman at 2023-09-21T02:03:38-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

- - - - -
c2643bf7 by Ben Gamari at 2023-09-21T02:03:38-04:00
gitlab-ci: Drop libiserv from upload_ghc_libs

libiserv has been merged into the ghci package.

- - - - -
3319659c by Ben Gamari at 2023-09-21T02:03:39-04:00
testsuite: Fix Windows line endings

- - - - -
1b7054bb by Ben Gamari at 2023-09-21T02:03:39-04:00
testsuite: Use makefile_test

- - - - -
eae4d0a4 by Ben Gamari at 2023-09-21T02:03:39-04:00
system-cxx-std-lib: Add license and description
- - - - -
080f79db by Ben Gamari at 2023-09-21T02:03:39-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
- compiler/GHC/Driver/Main.hs
- compiler/GHC/Driver/Pipeline/Execute.hs
- compiler/GHC/Driver/Session.hs
- compiler/GHC/Settings.hs
- compiler/GHC/Settings/IO.hs
- compiler/GHC/SysTools/Tasks.hs
- + compiler/GHC/Utils/Touch.hs
- compiler/ghc.cabal.in
- hadrian/bindist/Makefile
- hadrian/bindist/config.mk.in
- 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/cfg/system.config.in
- hadrian/hadrian.cabal
- hadrian/src/Builder.hs

The diff was not included because it is too large.

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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/aee49c2527bbe90aa927314a8f7c1319e0158405...080f79db3dd63f31ab0adfc6f5902cbcdc89c720
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/674cef6a/attachment-0001.html>