Skip to content

Commit

Permalink
Update homebrew formula to depend on [email protected] (#45)
Browse files Browse the repository at this point in the history
Since `[email protected]` is now the default when the formula aliases
`python` or `python3` are used:
https://formulae.brew.sh/formula/[email protected]

As such, many other formulae are already using `[email protected]`,
so updating to it for this project reduces the chance users will
end up having to have two different Python versions installed.

Given that now:
1. `crosstool-ng` has already updated it's own `depends_on`
   to `[email protected]`
2. The Python command alias here has been set to `python3`
   via `CT_GDB_CROSS_PYTHON_BINARY` in the various `.config`s

...I'm hopeful this should be more successful than when I attempted
a Python version bump to 3.11 in #20 :-)
  • Loading branch information
edmorley authored Sep 12, 2024
1 parent c646afb commit 111c174
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
run: |
brew install coreutils crosstool-ng
# fix python env in the runner
brew unlink python@3.11 && brew link --overwrite python@3.11
brew unlink python@3.12 && brew link --overwrite python@3.12
python3 --version
- name: Mount volumes
run: |
Expand Down
2 changes: 1 addition & 1 deletion aarch64-unknown-linux-gnu.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Aarch64UnknownLinuxGnu < Formula
depends_on "bdw-gc"
depends_on "guile"
depends_on "zstd"
depends_on "python@3.11"
depends_on "python@3.12"

if Hardware::CPU.arm?
url "https://github.com/messense/homebrew-macos-cross-toolchains/releases/download/v13.2.0/aarch64-unknown-linux-gnu-aarch64-darwin.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion aarch64-unknown-linux-musl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Aarch64UnknownLinuxMusl < Formula
depends_on "bdw-gc"
depends_on "guile"
depends_on "zstd"
depends_on "python@3.11"
depends_on "python@3.12"

if Hardware::CPU.arm?
url "https://github.com/messense/homebrew-macos-cross-toolchains/releases/download/v13.2.0/aarch64-unknown-linux-musl-aarch64-darwin.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion arm-unknown-linux-gnueabi.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class ArmUnknownLinuxGnueabi < Formula
depends_on "bdw-gc"
depends_on "guile"
depends_on "zstd"
depends_on "python@3.11"
depends_on "python@3.12"

if Hardware::CPU.arm?
url "https://github.com/messense/homebrew-macos-cross-toolchains/releases/download/v13.2.0/arm-unknown-linux-gnueabi-aarch64-darwin.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion arm-unknown-linux-gnueabihf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class ArmUnknownLinuxGnueabihf < Formula
depends_on "bdw-gc"
depends_on "guile"
depends_on "zstd"
depends_on "python@3.11"
depends_on "python@3.12"

if Hardware::CPU.arm?
url "https://github.com/messense/homebrew-macos-cross-toolchains/releases/download/v13.2.0/arm-unknown-linux-gnueabihf-aarch64-darwin.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion arm-unknown-linux-musleabihf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class ArmUnknownLinuxMusleabihf < Formula
depends_on "bdw-gc"
depends_on "guile"
depends_on "zstd"
depends_on "python@3.11"
depends_on "python@3.12"

if Hardware::CPU.arm?
url "https://github.com/messense/homebrew-macos-cross-toolchains/releases/download/v13.2.0/arm-unknown-linux-musleabihf-aarch64-darwin.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion armv7-unknown-linux-gnueabihf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Armv7UnknownLinuxGnueabihf < Formula
depends_on "bdw-gc"
depends_on "guile"
depends_on "zstd"
depends_on "python@3.11"
depends_on "python@3.12"

if Hardware::CPU.arm?
url "https://github.com/messense/homebrew-macos-cross-toolchains/releases/download/v13.2.0/armv7-unknown-linux-gnueabihf-aarch64-darwin.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion armv7-unknown-linux-musleabihf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Armv7UnknownLinuxMusleabihf < Formula
depends_on "bdw-gc"
depends_on "guile"
depends_on "zstd"
depends_on "python@3.11"
depends_on "python@3.12"

if Hardware::CPU.arm?
url "https://github.com/messense/homebrew-macos-cross-toolchains/releases/download/v13.2.0/armv7-unknown-linux-musleabihf-aarch64-darwin.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion i686-unknown-linux-gnu.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class I686UnknownLinuxGnu < Formula
depends_on "bdw-gc"
depends_on "guile"
depends_on "zstd"
depends_on "python@3.11"
depends_on "python@3.12"

if Hardware::CPU.arm?
url "https://github.com/messense/homebrew-macos-cross-toolchains/releases/download/v13.2.0/i686-unknown-linux-gnu-aarch64-darwin.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion i686-unknown-linux-musl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class I686UnknownLinuxMusl < Formula
depends_on "bdw-gc"
depends_on "guile"
depends_on "zstd"
depends_on "python@3.11"
depends_on "python@3.12"

if Hardware::CPU.arm?
url "https://github.com/messense/homebrew-macos-cross-toolchains/releases/download/v13.2.0/i686-unknown-linux-musl-aarch64-darwin.tar.gz"
Expand Down
4 changes: 2 additions & 2 deletions mipsel-unknown-linux-gnu.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ class MipselUnknownLinuxGnu < Formula
depends_on "zstd"

if Hardware::CPU.arm?
depends_on "python@3.11"
depends_on "python@3.12"
url "https://github.com/messense/homebrew-macos-cross-toolchains/releases/download/v13.2.0/mipsel-unknown-linux-gnu-aarch64-darwin.tar.gz"
sha256 "b4e521bb7c28ed2b66f94f6a1bb6e840066fcbe1e4efde01528921cda3a07e99"
else
depends_on "python@3.11"
depends_on "python@3.12"
url "https://github.com/messense/homebrew-macos-cross-toolchains/releases/download/v13.2.0/mipsel-unknown-linux-gnu-x86_64-darwin.tar.gz"
sha256 "5585d3890d5b978f67e39812203667b1ddf1719ff3e0b6ce06d9bdce8e7a0903"
end
Expand Down
2 changes: 1 addition & 1 deletion x86_64-unknown-linux-gnu.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class X8664UnknownLinuxGnu < Formula
depends_on "bdw-gc"
depends_on "guile"
depends_on "zstd"
depends_on "python@3.11"
depends_on "python@3.12"

if Hardware::CPU.arm?
url "https://github.com/messense/homebrew-macos-cross-toolchains/releases/download/v13.2.0/x86_64-unknown-linux-gnu-aarch64-darwin.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion x86_64-unknown-linux-musl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class X8664UnknownLinuxMusl < Formula
depends_on "bdw-gc"
depends_on "guile"
depends_on "zstd"
depends_on "python@3.11"
depends_on "python@3.12"

if Hardware::CPU.arm?
url "https://github.com/messense/homebrew-macos-cross-toolchains/releases/download/v13.2.0/x86_64-unknown-linux-musl-aarch64-darwin.tar.gz"
Expand Down

0 comments on commit 111c174

Please sign in to comment.