From 4d694e32b5e82933bb5f03cd659615c3ac54f2d7 Mon Sep 17 00:00:00 2001 From: Valentin Chaboche Date: Thu, 5 Jun 2025 10:08:04 +0200 Subject: [PATCH] Deps: pin `base` compatible with Mac --- opam/virtual/octez-deps.opam.locked | 10 ++++++++-- scripts/update_opam_lock.sh | 9 +++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/opam/virtual/octez-deps.opam.locked b/opam/virtual/octez-deps.opam.locked index 74f780d1cc08..b4c57f33fa2a 100644 --- a/opam/virtual/octez-deps.opam.locked +++ b/opam/virtual/octez-deps.opam.locked @@ -287,6 +287,12 @@ conflicts: [ available: os-family != "windows" dev-repo: "git+https://gitlab.com/tezos/tezos.git" pin-depends: [ - "stdcompat.19" - "git+https://github.com/thierry-martinez/stdcompat.git#d53390d788027fe0a2282c4745eb3d1626341f99" + [ + "base.v0.16.4" + "git+https://github.com/vch9/base.git#1d0cdedec2a8c63608d3c34531565903d5918ff6" + ] + [ + "stdcompat.19" + "git+https://github.com/thierry-martinez/stdcompat.git#d53390d788027fe0a2282c4745eb3d1626341f99" + ] ] diff --git a/scripts/update_opam_lock.sh b/scripts/update_opam_lock.sh index cee4c89af1e2..98fc32f97353 100755 --- a/scripts/update_opam_lock.sh +++ b/scripts/update_opam_lock.sh @@ -86,6 +86,15 @@ export OPAMSOLVERTIMEOUT="${OPAMSOLVERTIMEOUT:-600}" echo "---- Pinning stdcompat" opam pin add https://github.com/thierry-martinez/stdcompat.git#d53390d788027fe0a2282c4745eb3d1626341f99 -n -y +# Pin base to a commit that's compatible with latest versions of Mac OS. +# +# Base has a mechanism to detect if `-mpopcnt` is compatible with `cc`, it works +# partially on recent versions of base. The version pinned is a fork of +# `v0.16.4` cherry-picking a work-in-progress pull request that improves the +# mechanism to check `-mpopcnt` compatibility. +echo "---- Pinning base" +opam pin add https://github.com/vch9/base.git#1d0cdedec2a8c63608d3c34531565903d5918ff6 -y + # Ask opam to find a solution that covers both: # - 'octez-deps', so that we can compile Octez; # - 'octez-dev-deps', so that the solution is compatible with tools that devs -- GitLab