Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport batch 2 #6400

Closed
wants to merge 40 commits into from
Closed

Backport batch 2 #6400

wants to merge 40 commits into from

Conversation

phadej
Copy link
Collaborator

@phadej phadej commented Dec 3, 2019

23Skidoo and others added 30 commits June 25, 2019 03:43
Issue haskell#5119 is tracking spurious generation of these warnings. There
are a lot of them! We can't release with so many false positives, so
just squelch the warning outright.

This is a hack and this commit should be reverted if we get a proper
fix that can be backported to the 2.4 branch.

(cherry picked from commit e8ba731)
(cherry picked from commit 4d2ca52)
While those buildinfo fields were added to the parser some time
ago via 57d7f28 and
4a28765 that work was never completed
by implementing the necessary build/sdist logic in Cabal.

This commit remedies this oversight by implementing and wiring up the
missing build logic.

NOTE: This is a backport of (at time of writing) unfinished
      haskell#6033 to the 3.0 branch
      Specifically preprocessor-generated asm/cmm-sources need more
      work.

Co-authored-by: Sylvain Henry <sylvain@haskus.fr>
* Fix `v2-repl` changing directory incorrectly.

* Add changelog entry

* Add haddocks

* Add check for GHC geq 7.6 (`-ghci-script` wasn't there yet)

(cherry picked from commit fef6d8d)
Make `debug-info` >= 1 imply library/executable-stripping: False

(cherry picked from commit ed3ae13)
)

Treating globs like filenames was always illegitimate, but this code
was broken further by the addition of recursive globs.

I had a look around for other dubious code along these lines, and it
looks like this site is the only problematic one.

Fixes haskell#6125.

(cherry picked from commit 7fec503)
Parse list fields in cabal config file

(cherry picked from commit 0d32892)
Previously we would issue a warning of the following form when
we encountered a field that isn't supported by the cabal-version
declared in the cabal file:

    Warning: ghc-heap.cabal:30:3: The field "cmm-sources" is available
    only since the Cabal specification version 3.0.

The message, however, doesn't tell the user the consequence of this
warning. Consequently a user could easily be confused when the build
subsequently fail.

Avoid this possibility by clearly stating that the field value will be
ignored.
…o-ghc

Pass `ld-options` through to GHC

(cherry picked from commit 853414b)
cabal run works with Literate Haskell file

(cherry picked from commit dc13803)
Issue 5977

(cherry picked from commit 0d2d9ca)
Add changelog for haskell#5977 amd haskell#6134 fixes [ci skip]

(cherry picked from commit 773ad13)
…-default

Default to non-interactive init.

(cherry picked from commit 690d6c5)
Fix v2-install ProgramDb confusion

(cherry picked from commit a7a9766)
- Add needProgram
  Ad use it to make readPkgConfigDb not fail if there aren't pkg-config
  executable.
- Skip few tests on windows
- Use removePathForcibly in integration-tests2 if available
  remove local tarball test on Windows
phadej and others added 10 commits December 3, 2019 11:33
- They use 7.10.3 and 8.0.2
- timeout quite often.
- Let's have them, but let them fail without red mark
Also in CI setup, install hackage-repo-tool using `cabal new-install`.
And remove slightly confusing cabal.project.travis file.
Use cabal-install-3.0, as otherwise we won't be able to build
custom setup for GHC-8.8
@phadej phadej closed this Dec 3, 2019
@phadej
Copy link
Collaborator Author

phadej commented Dec 3, 2019

I have no idea why GitHub created this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants