From 6bf5704deeee416f9b1a7265ac228a447467e46f Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Sun, 8 Sep 2024 10:37:52 +0100 Subject: [PATCH] Update homebrew formula to depend on python@3.12 Since `python@3.12` is now the default when the formula aliases `python` or `python3` are used: https://formulae.brew.sh/formula/python@3.12 As such, many other formulae are already using `python@3.12`, 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 `python@3.12` 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 :-) --- .github/workflows/Build.yml | 2 +- aarch64-unknown-linux-gnu.rb | 2 +- aarch64-unknown-linux-musl.rb | 2 +- arm-unknown-linux-gnueabi.rb | 2 +- arm-unknown-linux-gnueabihf.rb | 2 +- arm-unknown-linux-musleabihf.rb | 2 +- armv7-unknown-linux-gnueabihf.rb | 2 +- armv7-unknown-linux-musleabihf.rb | 2 +- i686-unknown-linux-gnu.rb | 2 +- i686-unknown-linux-musl.rb | 2 +- mipsel-unknown-linux-gnu.rb | 4 ++-- x86_64-unknown-linux-gnu.rb | 2 +- x86_64-unknown-linux-musl.rb | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 719cecf..37970ad 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -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: | diff --git a/aarch64-unknown-linux-gnu.rb b/aarch64-unknown-linux-gnu.rb index 810060d..285b6be 100644 --- a/aarch64-unknown-linux-gnu.rb +++ b/aarch64-unknown-linux-gnu.rb @@ -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" diff --git a/aarch64-unknown-linux-musl.rb b/aarch64-unknown-linux-musl.rb index cff4c4d..612a8bd 100644 --- a/aarch64-unknown-linux-musl.rb +++ b/aarch64-unknown-linux-musl.rb @@ -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" diff --git a/arm-unknown-linux-gnueabi.rb b/arm-unknown-linux-gnueabi.rb index 22a6a38..a7542f2 100644 --- a/arm-unknown-linux-gnueabi.rb +++ b/arm-unknown-linux-gnueabi.rb @@ -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" diff --git a/arm-unknown-linux-gnueabihf.rb b/arm-unknown-linux-gnueabihf.rb index deeaf55..5768288 100644 --- a/arm-unknown-linux-gnueabihf.rb +++ b/arm-unknown-linux-gnueabihf.rb @@ -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" diff --git a/arm-unknown-linux-musleabihf.rb b/arm-unknown-linux-musleabihf.rb index 3916306..c8f8197 100644 --- a/arm-unknown-linux-musleabihf.rb +++ b/arm-unknown-linux-musleabihf.rb @@ -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" diff --git a/armv7-unknown-linux-gnueabihf.rb b/armv7-unknown-linux-gnueabihf.rb index 128d499..e5e8c78 100644 --- a/armv7-unknown-linux-gnueabihf.rb +++ b/armv7-unknown-linux-gnueabihf.rb @@ -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" diff --git a/armv7-unknown-linux-musleabihf.rb b/armv7-unknown-linux-musleabihf.rb index 7c2f535..c93dbcb 100644 --- a/armv7-unknown-linux-musleabihf.rb +++ b/armv7-unknown-linux-musleabihf.rb @@ -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" diff --git a/i686-unknown-linux-gnu.rb b/i686-unknown-linux-gnu.rb index 976b1c0..35c4fa5 100644 --- a/i686-unknown-linux-gnu.rb +++ b/i686-unknown-linux-gnu.rb @@ -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" diff --git a/i686-unknown-linux-musl.rb b/i686-unknown-linux-musl.rb index 3387c93..e5955c2 100644 --- a/i686-unknown-linux-musl.rb +++ b/i686-unknown-linux-musl.rb @@ -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" diff --git a/mipsel-unknown-linux-gnu.rb b/mipsel-unknown-linux-gnu.rb index 1e8eea6..ea7bc1e 100644 --- a/mipsel-unknown-linux-gnu.rb +++ b/mipsel-unknown-linux-gnu.rb @@ -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 diff --git a/x86_64-unknown-linux-gnu.rb b/x86_64-unknown-linux-gnu.rb index d461b24..e741f76 100644 --- a/x86_64-unknown-linux-gnu.rb +++ b/x86_64-unknown-linux-gnu.rb @@ -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" diff --git a/x86_64-unknown-linux-musl.rb b/x86_64-unknown-linux-musl.rb index 82e40fe..2fffc97 100644 --- a/x86_64-unknown-linux-musl.rb +++ b/x86_64-unknown-linux-musl.rb @@ -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"