diff --git a/.github/workflows/check-commit.yml b/.github/workflows/check-commit.yml index f9b21f36..2e6b99e9 100644 --- a/.github/workflows/check-commit.yml +++ b/.github/workflows/check-commit.yml @@ -17,10 +17,10 @@ jobs: brew install --quiet automake berkeley-db@4 miniupnpc qt@5 gperf qrencode librsvg && curl -L https://raw.githubusercontent.com/vergecurrency/protobuf261/master/protobuf261.rb > protobuf261.rb && brew install protobuf261.rb - name: Brew install boost from our homebrew deps - run: curl -L https://raw.githubusercontent.com/vergecurrency/verge/refs/heads/master/depends/homebrew-formulas/boost176.rb > boost176.rb && brew install boost176.rb + run: curl -L https://raw.githubusercontent.com/vergecurrency/verge/refs/heads/master/depends/homebrew-formulas/boost179.rb > boost179.rb && brew install boost179.rb - name: Brew link dependencies - run: brew link qt@5 berkeley-db@4 boost176 + run: brew link qt@5 berkeley-db@4 boost179 - name: which clang/xcode run: clang --version diff --git a/depends/homebrew-formulas/boost176.rb b/depends/homebrew-formulas/boost179.rb similarity index 71% rename from depends/homebrew-formulas/boost176.rb rename to depends/homebrew-formulas/boost179.rb index 66aba680..98824f91 100644 --- a/depends/homebrew-formulas/boost176.rb +++ b/depends/homebrew-formulas/boost179.rb @@ -1,10 +1,10 @@ -class Boost176 < Formula +class Boost179 < Formula desc "Collection of portable C++ source libraries" homepage "https://www.boost.org/" - url "https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2" - sha256 "79e6d3f986444e5a80afbeccdaf2d1c1cf964baa8d766d20859d653a16c39848" + url "https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.bz2" + sha256 "475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39" license "BSL-1.0" - revision 6 + head "https://github.com/boostorg/boost.git", branch: "master" keg_only :versioned_formula @@ -13,16 +13,6 @@ class Boost176 < Formula uses_from_macos "bzip2" uses_from_macos "zlib" - # Backport fixes for newer Clang - patch :p2 do - url "https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a.patch?full_index=1" - sha256 "d96761257f7efc2edc8414f1a2522fc07a3d7d56bb55a51d14af9abd39e389c8" - end - patch :p2 do - url "https://github.com/boostorg/mpl/commit/b37b709cbdb6b2c285fb808dab985aa005786351.patch?full_index=1" - sha256 "b8013ad3e6b63698158319f5efc2fe1558a00c1d2e32193086f741e774acc3e4" - end - def install # Force boost to compile with the desired compiler open("user-config.jam", "a") do |file| @@ -34,7 +24,7 @@ def install end # libdir should be set by --prefix but isn't - icu4c_prefix = Formula["icu4c@74"].opt_prefix + icu4c_prefix = Formula["icu4c"].opt_prefix bootstrap_args = %W[ --prefix=#{prefix} --libdir=#{lib} @@ -76,7 +66,7 @@ def install end test do - (testpath/"test.cpp").write <<~CPP + (testpath/"test.cpp").write <<~EOS #include #include #include @@ -94,8 +84,8 @@ def install assert(strVec[1]=="b"); return 0; } - CPP - system ENV.cxx, "-I#{Formula["boost@1.76"].opt_include}", "test.cpp", "-std=c++14", "-o", "test" + EOS + system ENV.cxx, "test.cpp", "-std=c++14", "-o", "test" system "./test" end -end +end \ No newline at end of file