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.

Sign up for GitHub

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

2.1.6 backport commits #5870

Merged
merged 15 commits into from
May 16, 2024
Merged

2.1.6 backport commits #5870

merged 15 commits into from
May 16, 2024

Commits on May 15, 2024

  1. Upgrade the vendored dune to 3.14.0

    @kit-ty-kate @rjbou
    kit-ty-kate authored and rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    736e30b View commit details
    Browse the repository at this point in the history

  2. Make the makefile compatible with dune >= 2.9.1

    @kit-ty-kate @rjbou
    kit-ty-kate authored and rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    5954f9b View commit details
    Browse the repository at this point in the history

  3. Better recognize depexts on Gentoo, NetBSD, OpenBSD 

    Gentoo, NetBSD, and OpenBSD name packages in a /-separated
hierarchy.  For example, libgmp is available as "dev-libs/gmp"
(on Gentoo[1]) or "devel/gmp" (on NetBSD[2], or OpenBSD[3]).

The first fix in this commit (the change to the `short_name` function)
removes the leading "/" from the package's short name.  Prior to this
commit, if `pkg` were "dev-libs/gmp", then `short_name` would be
"/gmp". That doesn't match the depext name of "gmp" so opam thought
the package wasn't installed.

OpenBSD also uses flavors and subpackages[4] in some of its package
names.  For example, OpenBSD has two subpackages for the "devel/gmp"
package: main and cxx. That means that the full name for libgmp on
OpenBSD is likely to be "devel/gmp,-main".  Prior to this commit,
`short_name` for this package was "gmp,-main".  This commit introduces
`no_flavor` which removes the flavors and subpackages from package
names, if present.  That causes "devel/gmp,-main" on OpenBSD to have a
`no_flavor` name of "gmp".  This name matches the depext name, so that
opam recognizes that libgmp is installed.

1: https://packages.gentoo.org/packages/dev-libs/gmp
2: https://cdn.netbsd.org/pub/pkgsrc/current/pkgsrc/devel/gmp/index.html
3: https://github.com/openbsd/ports/tree/b12d29201e832eb5a230d54449ff2a13502c9fbb/devel/gmp
4: https://man.openbsd.org/OpenBSD-7.0/pkgpath.7
    @mndrix @rjbou
    mndrix authored and rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    42f6933 View commit details
    Browse the repository at this point in the history

  4. Warn if GNU patch is not detected during opam update

    @kit-ty-kate @rjbou
    kit-ty-kate authored and rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    1f2e2f9 View commit details
    Browse the repository at this point in the history

  5. Use gpatch on NetBSD and DragonFlyBSD

    @kit-ty-kate @rjbou
    kit-ty-kate authored and rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    86379a9 View commit details
    Browse the repository at this point in the history

  6. Update master_changes.md

    @kit-ty-kate @rjbou
    kit-ty-kate authored and rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    2760fd4 View commit details
    Browse the repository at this point in the history

  7. Upgrade to mccs.1.1+17

    @kit-ty-kate @rjbou
    kit-ty-kate authored and rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    7c08c3e View commit details
    Browse the repository at this point in the history

  8. update CI

    @kit-ty-kate @rjbou
    kit-ty-kate authored and rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    049639c View commit details
    Browse the repository at this point in the history

  9. Remove mccs patch

    @kit-ty-kate @rjbou
    kit-ty-kate authored and rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    392c4a9 View commit details
    Browse the repository at this point in the history

  10. GHA: install gpatch on macOS

    @kit-ty-kate @rjbou
    kit-ty-kate authored and rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    e074e6e View commit details
    Browse the repository at this point in the history

  11. GHA: fix cudf-preprocess reftest on macOS/arm64

    @kit-ty-kate @rjbou
    kit-ty-kate authored and rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    6c56d64 View commit details
    Browse the repository at this point in the history

  12. Fix recipes

    @dra27 @rjbou
    dra27 authored and rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    d9fae98 View commit details
    Browse the repository at this point in the history

  13. GHA: Sync OPAM_REPO_SHA for the solver runs

    @kit-ty-kate @rjbou
    kit-ty-kate authored and rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    a47c3bd View commit details
    Browse the repository at this point in the history

  14. update CHANGES

    @rjbou
    rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    c47ee00 View commit details
    Browse the repository at this point in the history

  15. Bump version to 2.1.6

    @rjbou
    rjbou committed May 15, 2024
    Configuration menu
    Copy the full SHA
    d614bfa View commit details
    Browse the repository at this point in the history