diff --git a/Aliases/ocaml@5 b/Aliases/ocaml@5 new file mode 120000 index 0000000000000..0f2149f5082cf --- /dev/null +++ b/Aliases/ocaml@5 @@ -0,0 +1 @@ +../Formula/o/ocaml.rb \ No newline at end of file diff --git a/Formula/c/camlp-streams.rb b/Formula/c/camlp-streams.rb index 39fdc5b14ca49..8ccdb4b572802 100644 --- a/Formula/c/camlp-streams.rb +++ b/Formula/c/camlp-streams.rb @@ -4,18 +4,16 @@ class CamlpStreams < Formula url "https://github.com/ocaml/camlp-streams/archive/refs/tags/v5.0.1.tar.gz" sha256 "ad71f62406e9bb4e7fb5d4593ede2af6c68f8b0d96f25574446e142c3eb0d9a4" license "LGPL-2.1-only" => { with: "OCaml-LGPL-linking-exception" } + revision 1 bottle do - sha256 cellar: :any, arm64_sonoma: "e329a416fd6e58bde5d1b39a4ac5a194960f398b2e825c9b819c656d3729cb11" - sha256 cellar: :any, arm64_ventura: "71fce4c1acb3764add19c7bc62932779d6eba6bd5a71c5eb0da1f1d94631f58f" - sha256 cellar: :any, arm64_monterey: "1aa419c01a3ca2738adf10d613def4cb213efea7c7af7682246287ef5a96a09a" - sha256 cellar: :any, arm64_big_sur: "551ca86de9bdb769f0f22de773eb4a93f9faf31193f6b8833e39d30efe15fa03" - sha256 cellar: :any, sonoma: "105139063c2a04638025f44bae454692f5cf2782fe977abbe6294319727109e0" - sha256 cellar: :any, ventura: "0a47174a14ce39c3f2c3b1528a01365a2fd3269533f0eb7b6605faf698fb7545" - sha256 cellar: :any, monterey: "f4fd0d6a51abb24f93fea4e7326dce470808aa5d6f2a8aca2750cd4bc9987174" - sha256 cellar: :any, big_sur: "ee7ac1eda08673f956c10805187f58271fc1867522d93c004ebdbc085ca822af" - sha256 cellar: :any, catalina: "0ef92902025844dd1abbe5fdc3f3c8e114b090738e6022f68d72c21aa608b9d3" - sha256 cellar: :any_skip_relocation, x86_64_linux: "81e1d03158ed662d6266ae792dcb9145c042c61c0d3bd2b0e1079f8e42d6c72b" + sha256 cellar: :any, arm64_sonoma: "1ab3f2156883e27bcfeff416cccb5e6f5e32102a52640299c5d6ca561b0b09f4" + sha256 cellar: :any, arm64_ventura: "ee43234549a20178bcc759f2b630f68869c956527061079b3203091358c49195" + sha256 cellar: :any, arm64_monterey: "c88d7c4203e0111c6f21c6db54bfeb963e7962025741659d827a4153a096f3e0" + sha256 cellar: :any, sonoma: "909acae960bc459db4f9f721801086296809a7b85db919229cc26ae67457f92e" + sha256 cellar: :any, ventura: "e57d2a7c4e1ed7d865c72f6e0699a5e8439b22b76cff119ca10f41ccaf38ac92" + sha256 cellar: :any, monterey: "584919e25737e013998be682d4cb0b79a512dd37180444e134f853c254586fd6" + sha256 cellar: :any_skip_relocation, x86_64_linux: "c23521a07bf157dc5f7fd018fdc804149a5e4c4acb375db87f1396bf50a1321c" end depends_on "dune" => :build @@ -28,6 +26,11 @@ def install end test do + # Work around for https://github.com/Homebrew/homebrew-test-bot/issues/805 + if ENV["HOMEBREW_GITHUB_ACTIONS"] && !(Formula["ocaml-findlib"].etc/"findlib.conf").exist? + ENV["OCAMLFIND_CONF"] = Formula["ocaml-findlib"].opt_libexec/"findlib.conf" + end + (testpath/"test.ml").write <<~EOS let stream = Stream.of_list ([] : unit list) EOS diff --git a/Formula/c/camlp5.rb b/Formula/c/camlp5.rb index 9309d19f0f7b4..1857918750478 100644 --- a/Formula/c/camlp5.rb +++ b/Formula/c/camlp5.rb @@ -4,6 +4,7 @@ class Camlp5 < Formula url "https://github.com/camlp5/camlp5/archive/refs/tags/8.02.01.tar.gz" sha256 "58d4bce0c20fa1151fc2c15f172f5884472e2044a4b0da22aababf46c361e515" license "BSD-3-Clause" + revision 1 head "https://github.com/camlp5/camlp5.git", branch: "master" livecheck do @@ -12,15 +13,13 @@ class Camlp5 < Formula end bottle do - sha256 arm64_sonoma: "68bc1221b21f49d08586934bc06f19a62eef0308b92aa6257b5313e3f97e08e3" - sha256 arm64_ventura: "b66cf027c5621a927617b974a01507b903b60f92aed85458b50bd1571241cb69" - sha256 arm64_monterey: "3176a9e4b1bf08b23615ada8387811cf2d63b8acbc18d1e1d4645007350a0bab" - sha256 arm64_big_sur: "087ce00b6ef3367386236ba7832c658b01fe0e41288647f4a9a41dd304e6aebd" - sha256 sonoma: "056cdf35c1cc5a6dfac714380f69cc3851d535464ef347af7ed70a866ddb3015" - sha256 ventura: "7043d9895aa1e64a3ac4a7a9f26778770dd91b17a8507e35b43614f84d7dac21" - sha256 monterey: "dcbffb83005849f1446742c2ba704577a495e2ef9ca82375d87b03d76640d977" - sha256 big_sur: "dcc8d08791e3b42d7faba7faeebc3dc2c0fd17d23b730ad5a4dd468ad5d4d862" - sha256 x86_64_linux: "16ba10a0ccfbda37bbed0d5513c5c7d4f82e5f7b40c102c48024429ddd4635d2" + sha256 arm64_sonoma: "b759ee090fbf543cdc3fc06316f6e49688031dadc5f596dcb7d202c5e9b6259d" + sha256 arm64_ventura: "fecb24a088b59346812faa716de555a939e6ff0efd38cec825ce4178834c3ba7" + sha256 arm64_monterey: "6b9fb48113e2cb84683f72fa3744da3bbe00f483df59ea1e07016a2e06352a9f" + sha256 sonoma: "23da0a4d852c4d00da8523d2a2303b482dbddd40a9eb8d674f87907d9f718937" + sha256 ventura: "07d9c205a10282211954729926982a14215def6e5ebf511bba15a39d0f77adf4" + sha256 monterey: "582c31c1fd609b1904515b878ce4a2f886391a042ae6b9de6d595dabf832fda9" + sha256 x86_64_linux: "6dbd19efdc0c99cd9fb94ee55ce1b8d5f6ee12e73ae93a3146c5bdec602e04d3" end depends_on "ocaml-findlib" => :build @@ -48,11 +47,11 @@ def install ocaml = Formula["ocaml"] (testpath/"hi.ml").write "print_endline \"Hi!\";;" assert_equal "let _ = print_endline \"Hi!\"", - # The purpose of linking with the file "bigarray.cma" is to ensure that the + # The purpose of linking with the file "str.cma" is to ensure that the # ocaml files are in sync with the camlp5 files. If camlp5 has been # compiled with an older version of the ocaml compiler, then an error # "interface mismatch" will occur. shell_output("#{bin}/camlp5 #{lib}/ocaml/camlp5/pa_o.cmo #{lib}/ocaml/camlp5/pr_o.cmo " \ - "#{ocaml.opt_lib}/ocaml/bigarray.cma hi.ml") + "#{ocaml.opt_lib}/ocaml/str/str.cma hi.ml") end end diff --git a/Formula/c/coccinelle.rb b/Formula/c/coccinelle.rb index c4415fc217cee..fb6160101aacf 100644 --- a/Formula/c/coccinelle.rb +++ b/Formula/c/coccinelle.rb @@ -1,27 +1,54 @@ class Coccinelle < Formula desc "Program matching and transformation engine for C code" homepage "https://coccinelle.lip6.fr/" - url "https://github.com/coccinelle/coccinelle.git", - tag: "1.1.1", - revision: "5444e14106ff17404e63d7824b9eba3c0e7139ba" license "GPL-2.0-only" revision 1 head "https://github.com/coccinelle/coccinelle.git", branch: "master" + stable do + url "https://github.com/coccinelle/coccinelle.git", + tag: "1.1.1", + revision: "5444e14106ff17404e63d7824b9eba3c0e7139ba" + + # Backport compatibility with OCaml 5. Remove in the next release. + patch do + url "https://github.com/coccinelle/coccinelle/commit/f13b03aa20a08e5187ce36bfd5e606f18acd2888.patch?full_index=1" + sha256 "84f06551652d9fcee63451fe8d3bce3845c01fe054087cde50bb3b8308014445" + end + patch do + url "https://github.com/coccinelle/coccinelle/commit/1d0733a27006b06eef712f541000a8bf10246804.patch?full_index=1" + sha256 "391ee079fc18ac4727af089fdf686cd41d4b2ba7847c4bcf2b3b04caf5b6d457" + end + + # Backport usage of non-bundled packages to allow versions installed by opam + patch do + url "https://github.com/coccinelle/coccinelle/commit/3f54340c8ac907e528dbe1475a4a7141e77b9cdd.patch?full_index=1" + sha256 "94b23b53c023270368601bc5debefc918a99f87b7489e25acddf9c967ddb4486" + end + patch do + url "https://github.com/coccinelle/coccinelle/commit/2afa9f669b565badf17104176cc4850a2dff67f6.patch?full_index=1" + sha256 "882fe080f7fbce4b0f08b8854a5b02212c17efbc2a62c145eae562842d8e2337" + end + patch do + url "https://github.com/coccinelle/coccinelle/commit/d9ce82a556e313684af74912cf204bb902e04436.patch?full_index=1" + sha256 "4b27d81d27363efb1a83064abba1df1c09a1f1f064c81cc621ca61b79f58d83e" + end + end + livecheck do url :stable regex(/^v?(\d+(?:\.\d+)+)$/i) end bottle do - sha256 arm64_ventura: "c36d64915f8f1fb1d3f1b11affa180d87cce7c2fab525ca5d43e000d6552ac84" - sha256 arm64_monterey: "6d709b2576f84260edf15ed3a6c4e4b4e0cc73bde3819f9d9085f964c761b155" - sha256 arm64_big_sur: "43e22010b8b1f3bf93817d161e2d0e96d907f4a38972d27f91d0231042f70860" - sha256 ventura: "7d44848e93251045e263c647aa95c2fd7639ab2918dcdea672ea12115c0f922d" - sha256 monterey: "9e00a25cc6afe398d4a5ae42300bacd883bf1f570e6c1523ffb43bd3d330ae30" - sha256 big_sur: "270fe7690278277362ebf04707665ae41e3831c21e33d945408f2e7d9737669e" - sha256 catalina: "27b442146b362f44848997fa840389ff9df05317e915147d289a74e1ef4c5a68" - sha256 x86_64_linux: "29a0aeaeb102990cac27cdc3ecc713f2af6366f38c5d3cefb520ef70dcd2fa84" + rebuild 1 + sha256 arm64_sonoma: "ca6145d84ac088d6a9af56409383ee95fcdfc019d565f57a16ab6571b468df10" + sha256 arm64_ventura: "cb7b2f3f20840b99f22efba6538fd4e7a6fa3868aa9f934c5722e26a968dc753" + sha256 arm64_monterey: "368b32215f0409f8686364f2d5f9fa6d6ef3896ae1baddba37ad34abc2021a8a" + sha256 sonoma: "6e9fcb9482970a2459a8e6bc4b319cd06d555dbfcd6501ad5cae9d9fc8dad61b" + sha256 ventura: "60b09a4b123954c6a206cfa471c8653622f9567f786eb183241b1cd55f412128" + sha256 monterey: "108f9640319df581d2feb12d6f52540d7f30876d24f48547e2a901ddda474aed" + sha256 x86_64_linux: "1d24df746aee06ce03219fb78ff208b30b7b14c666195e30623c9012c9f825ea" end depends_on "autoconf" => :build @@ -30,42 +57,28 @@ class Coccinelle < Formula depends_on "ocaml-findlib" => :build depends_on "opam" => :build depends_on "pkg-config" => :build + depends_on "python@3.12" => :build depends_on "ocaml" depends_on "pcre" uses_from_macos "unzip" => :build - # Bootstrap resource for Ocaml 4.12 compatibility. - # Remove when Coccinelle supports Ocaml 4.12 natively - resource "stdcompat" do - url "https://github.com/thierry-martinez/stdcompat/releases/download/v15/stdcompat-15.tar.gz" - sha256 "5e746f68ffe451e7dabe9d961efeef36516b451f35a96e174b8f929a44599cf5" - end - def install - resource("stdcompat").stage do - system "./configure", "--prefix=#{buildpath}/bootstrap" - ENV.deparallelize { system "make" } - system "make", "install" - end - ENV.prepend_path "OCAMLPATH", buildpath/"bootstrap/lib" - Dir.mktmpdir("opamroot") do |opamroot| ENV["OPAMROOT"] = opamroot ENV["OPAMYES"] = "1" ENV["OPAMVERBOSE"] = "1" system "opam", "init", "--no-setup", "--disable-sandboxing" + system "opam", "exec", "--", "opam", "install", ".", "--deps-only", "-y", "--no-depexts" system "./autogen" - system "opam", "config", "exec", "--", "./configure", - "--disable-dependency-tracking", - "--enable-release", - "--enable-ocaml", - "--enable-opt", - "--with-pdflatex=no", - "--prefix=#{prefix}", - "--libdir=#{lib}" + system "opam", "exec", "--", "./configure", *std_configure_args, + "--disable-silent-rules", + "--enable-ocaml", + "--enable-opt", + "--without-pdflatex", + "--with-bash-completion=#{bash_completion}" ENV.deparallelize - system "opam", "config", "exec", "--", "make" + system "opam", "exec", "--", "make" system "make", "install" end diff --git a/Formula/c/comby.rb b/Formula/c/comby.rb index 3169ec2131f14..225fa8511569e 100644 --- a/Formula/c/comby.rb +++ b/Formula/c/comby.rb @@ -6,21 +6,19 @@ class Comby < Formula license "Apache-2.0" bottle do - sha256 cellar: :any, arm64_sonoma: "e1b1c09efa1955a2ae845e6783ef790f01f3afad0a170cc7f82f2b39d49b5a26" - sha256 cellar: :any, arm64_ventura: "ead924a94b73aede202b3afc9146124efb1ac7b8416e0b0119a59cf2ab6d3310" - sha256 cellar: :any, arm64_monterey: "c75ee2deab2abc20778e51a40cbb7ca305948dc0e10c6e13e9d23004d26f8dfb" - sha256 cellar: :any, arm64_big_sur: "886f0b5d1a6ac7075a18f3d0075578e81ae2462656a578cf61c344622629a5a4" - sha256 cellar: :any, sonoma: "7ae11688f7baff37ed21570abb0615e0ae36103c1b8d83942bd7ee569b301544" - sha256 cellar: :any, ventura: "535c3320832e70d126405a7535298c615dfdaa66e0ee0ddceaae680d3f189113" - sha256 cellar: :any, monterey: "8e84488e24e0df5a5bbee5a2df201eb1027c90d177ebcd8bf030c91dec47d636" - sha256 cellar: :any, big_sur: "72ce5e95f8772bc54d8d8706ed06e08ab99b9a6eb2682d8fea480ed1be202704" - sha256 cellar: :any, catalina: "7519ef48876a5d5b3636556b0b6987c1c9ec7b568d299c49b849036aafcb61bb" - sha256 x86_64_linux: "275be90d9ac8149c51abc9c5fc972e7aff125326cdadfd1ed0f55a8d6d84dc15" + rebuild 1 + sha256 cellar: :any, arm64_sonoma: "9879569428b8a7bde2b56490bf6bd99cf5f0cdc1c524250af7173eae9b3b6621" + sha256 cellar: :any, arm64_ventura: "375dd89916c279b00020467fdbb699d05807a6caf866ad35fa76d9adabcaff8b" + sha256 cellar: :any, arm64_monterey: "fb4cc78f0a4a95aa911d3bc4a619e53fae22a1bd5a4bbb94e17cdc849baa4485" + sha256 cellar: :any, sonoma: "fb116fe361c37cefad3d3d4aa0d37a8a76264e2920d3d9d49c4996423aaab5d4" + sha256 cellar: :any, ventura: "f46b53e793bbce9dd888ec53a90224566c2b52ce4c2db664f93a945a425ac52c" + sha256 cellar: :any, monterey: "54ab143ff66d46db4a02ad2c373edabf4c9ad23af83c0fd4945dc66b41ce9772" + sha256 x86_64_linux: "919a845aa0880568e9ca2288c6f390437a8e14a12a59a597e0b8e90f0f540b79" end depends_on "autoconf" => :build depends_on "gmp" => :build - depends_on "ocaml" => :build + depends_on "ocaml@4" => :build # https://github.com/comby-tools/comby/issues/358 depends_on "opam" => :build depends_on "pkg-config" => :build depends_on "gmp" diff --git a/Formula/l/ledit.rb b/Formula/l/ledit.rb index 0bd1b9aa4f163..cf9a35056a944 100644 --- a/Formula/l/ledit.rb +++ b/Formula/l/ledit.rb @@ -1,9 +1,9 @@ class Ledit < Formula desc "Line editor for interactive commands" homepage "https://pauillac.inria.fr/~ddr/ledit/" - url "https://github.com/chetmurthy/ledit/archive/refs/tags/ledit-2-05.tar.gz" - version "2.05" - sha256 "493ee6eae47cc92f1bee5f3c04a2f7aaa0812e4bdf17e03b32776ab51421392c" + url "https://github.com/chetmurthy/ledit/archive/refs/tags/ledit-2-06.tar.gz" + version "2.06" + sha256 "9fb4fe256ca9e878a0b47dfd43b4c64c6a3f089c9e76193b2db347f0d90855be" license "BSD-3-Clause" livecheck do @@ -15,26 +15,36 @@ class Ledit < Formula end bottle do - sha256 cellar: :any_skip_relocation, arm64_sonoma: "6c6d44cbb79018e7eb08d9f3f2f94fde098e31dd971f1697f68c9170278029c7" - sha256 cellar: :any_skip_relocation, arm64_ventura: "f4e5f04c79d703b1e22f1b49794bbf416135f209fcad88ae3bc043bc17114c1b" - sha256 cellar: :any_skip_relocation, arm64_monterey: "642349a8d05b4f9048fcd7d9fdf389e35d98b921e3d52bd06eee365b50a4f1e2" - sha256 cellar: :any_skip_relocation, arm64_big_sur: "06141836398681d2250bf04d1bba965038f5f707482f0ecab1cc464c8a95bcfb" - sha256 cellar: :any_skip_relocation, sonoma: "7a990f131f16b372437ad98b6708de1812b4e11d61acdaabda6197c86828ee03" - sha256 cellar: :any_skip_relocation, ventura: "2f70d37553e6bb5b2e1953781022747f4f1d0659934ef5103e92baa10b481d70" - sha256 cellar: :any_skip_relocation, monterey: "da6338af250d9b52557f52707b0730c379bdd8216c53e10477c351f72d6aa406" - sha256 cellar: :any_skip_relocation, big_sur: "2d404ace597c8a7062fbe96e15e9e7d1226ec5ca97e0c8981062c77fef10b4eb" - sha256 cellar: :any_skip_relocation, catalina: "158141ebf4edc253de428b8789d77eae0b19fdd4d8002e9910cf4c2486a12bb6" - sha256 cellar: :any_skip_relocation, mojave: "463dd47cebd8510a630e39008b001e52659f64f1bcda7503bdc8a0f28e55adfc" - sha256 cellar: :any_skip_relocation, x86_64_linux: "ec38d1627d6277d03b8a607a91d6d1d7c43b8f4287b15393e0a26cac27d04e06" + sha256 cellar: :any_skip_relocation, arm64_sonoma: "fb17134571471349a072e47eb5849e5ecc66006616fa77bf2363d04a8fa91446" + sha256 cellar: :any_skip_relocation, arm64_ventura: "26e778db2994c1524b3b993e94eb642586c227cfe04b103e9ead54a557fa67ac" + sha256 cellar: :any_skip_relocation, arm64_monterey: "9799ea6b0736a0a266eabd35ca40719683f4cb9dfecf220f4f73f3de26ee3b5d" + sha256 cellar: :any_skip_relocation, sonoma: "ab446bc5a875dc4527f05103db24700488cc32761aa241d18065ac6a66082971" + sha256 cellar: :any_skip_relocation, ventura: "3b7c8d59ad0746dab63189ddc5fa9176b177c39404c368520be0cf03c9c14cca" + sha256 cellar: :any_skip_relocation, monterey: "6fd3e1bcddb9d283dd6dbb8b84bb0dcab8ee5ec215bef0004be1c2a4991c912a" + sha256 cellar: :any_skip_relocation, x86_64_linux: "3521f1fe5b11e11d11a53c988888cf4807db6f5f17e420010e5c85a543ce7211" end + depends_on "ocaml-findlib" => :build + depends_on "camlp-streams" depends_on "camlp5" depends_on "ocaml" + # Backport Makefile fixes. Remove in the next release. + patch do + url "https://github.com/chetmurthy/ledit/commit/3dbd668d9c69aab5ccd61f6b906c14122ae3271d.patch?full_index=1" + sha256 "f5aafe054a5daa97d311155931bc997f1065b20acfdf23211fbcbf1172fd7e97" + end + def install + # Work around for https://github.com/Homebrew/homebrew-test-bot/issues/805 + if ENV["HOMEBREW_GITHUB_ACTIONS"] && !(Formula["ocaml-findlib"].etc/"findlib.conf").exist? + ENV["OCAMLFIND_CONF"] = Formula["ocaml-findlib"].opt_libexec/"findlib.conf" + end + # like camlp5, this build fails if the jobs are parallelized ENV.deparallelize - args = %W[BINDIR=#{bin} LIBDIR=#{lib} MANDIR=#{man}] + args = %W[BINDIR=#{bin} LIBDIR=#{lib} MANDIR=#{man1}] + args << "CUSTOM=" if OS.linux? # Work around brew corrupting appended bytecode system "make", *args system "make", "install", *args end diff --git a/Formula/o/ocaml-findlib.rb b/Formula/o/ocaml-findlib.rb index 3c4572da37a0b..65988b2a0c2e3 100644 --- a/Formula/o/ocaml-findlib.rb +++ b/Formula/o/ocaml-findlib.rb @@ -4,6 +4,7 @@ class OcamlFindlib < Formula url "http://download.camlcity.org/download/findlib-1.9.6.tar.gz" sha256 "2df996279ae16b606db5ff5879f93dbfade0898db9f1a3e82f7f845faa2930a2" license "MIT" + revision 1 livecheck do url "http://download.camlcity.org/download/" @@ -11,16 +12,13 @@ class OcamlFindlib < Formula end bottle do - sha256 arm64_sonoma: "27f8601cdaa2e36271662c1284a30353c6b1c22f45ef7ccc3a7a4a1a73b60d6c" - sha256 arm64_ventura: "bac75b12905f7138e93455ef3c4599fd417448dccafec8cbf5cc63b7192b63c7" - sha256 arm64_monterey: "3b7dc9a49293c982c8b8fbb4bd3a979b652d9bf48b6ae6a915fe734960acb2d3" - sha256 arm64_big_sur: "259a336b537993add90ebef09bc6473dfa39426ee80292d443307f36e77e8ac4" - sha256 sonoma: "86ddb1564581e10c8f1c59bad5fae8126411a12cc0218eb3af2835557913f7e7" - sha256 ventura: "c9731166502de936c4897ce2f9c50b0432ac81f53dd904569ef406a4ac7bcbae" - sha256 monterey: "716c17abb924c7958ebad686f456cd3c19842ba334875ae0a91f1392df756815" - sha256 big_sur: "d6e7046fbe14735edb44ce83654736a476357344009fe7fd497416ade6374c47" - sha256 catalina: "ef1c177401fad930e6912ae5103326dc673913e0ec16d1bd730bcc6ba5a43cf8" - sha256 x86_64_linux: "c319106538e9f3e0faecd3900c1ebd105ad9b39645e0952ed5cd14de9b8ef2e4" + sha256 arm64_sonoma: "57ff114e13929f3b5382c78418a43b896cd2c4f3d9627d9017b1d94a2609489a" + sha256 arm64_ventura: "377870c6a2a9a7e059136d3fb161e9cf0d48191f4e3df7fb7adfc7003e0527fc" + sha256 arm64_monterey: "ad81c990d61dbcee8f0ab536ac519f697e7839313290a3b3f9ccff2717100a07" + sha256 sonoma: "187c3979f7d1a04e3e009a9c36d0943c5d6bf7ae780fdfb38a27e0923d31eea6" + sha256 ventura: "a0fc2d66f141c96efbf271429b7655ca53f05ee1c33350822903807beb8a96d7" + sha256 monterey: "32251158ac86cbfafb14df0866da222e540fa0c4a30a023e631fb411dc604a8d" + sha256 x86_64_linux: "0d81ac15dc0af7b4675ca0c2a5f302594ed5f5a676af51066d7d9c0f8f41faf5" end depends_on "ocaml" @@ -45,6 +43,10 @@ def install # Avoid conflict with ocaml-num package rm_rf Dir[lib/"ocaml/num", lib/"ocaml/num-top"] + + # Save extra findlib.conf to work around https://github.com/Homebrew/homebrew-test-bot/issues/805 + libexec.mkpath + cp etc/"findlib.conf", libexec/"findlib.conf" end test do diff --git a/Formula/o/ocaml-num.rb b/Formula/o/ocaml-num.rb index 6f851f3789b24..c82b85ce07e0c 100644 --- a/Formula/o/ocaml-num.rb +++ b/Formula/o/ocaml-num.rb @@ -4,25 +4,27 @@ class OcamlNum < Formula url "https://github.com/ocaml/num/archive/refs/tags/v1.4.tar.gz" sha256 "015088b68e717b04c07997920e33c53219711dfaf36d1196d02313f48ea00f24" license "LGPL-2.1" - revision 3 + revision 4 bottle do - sha256 cellar: :any, arm64_sonoma: "c9fa6f0a88f6aae923bba24c8dbd7355e65523d4fd72b8b80260f4dee7d072eb" - sha256 cellar: :any, arm64_ventura: "1376f678d4ee8141b6ce772985df8a1397f3e4831b02160a8057e3b195b26f90" - sha256 cellar: :any, arm64_monterey: "24a7c2eb700a74089c1fbdb5395473c4afa7f90e86372b556c7b48b4caab23fc" - sha256 cellar: :any, arm64_big_sur: "e14151e4a14faa9a43774d4682930994110f9d654d533091b48a35ed95bfe8eb" - sha256 cellar: :any, sonoma: "51ff686ec1003cddbcebfcb06f8fa03813ef1e23c571571916ccdbacf433093f" - sha256 cellar: :any, ventura: "6fd4ac3c6c935c55379ff625b59501cda84097a366fd762d99d6cdc1d66d5f91" - sha256 cellar: :any, monterey: "36835ca0d89b6ccf37c1dbb3596b2e1ba688148cac83d6ddda1d2bdf5ddb2a00" - sha256 cellar: :any, big_sur: "0d247f113c3d0135e09a2b0a12a9299217600477083b089c5731bcf2b2245c36" - sha256 cellar: :any, catalina: "5dbcc04ba33b58d14b77ae7382345b9abd913ce342c20c330c4cf15c936b24f2" - sha256 cellar: :any_skip_relocation, x86_64_linux: "8a1b1383e37f8f367f8f5c6c44a86f9e76c17080d3aa0465bfcff9328da88d68" + sha256 cellar: :any, arm64_sonoma: "4f55c47b06e334594da2c757e4c2dc82affc09672796172648185d8cdd8aaf31" + sha256 cellar: :any, arm64_ventura: "6522c296cac6b00245d89993e69ce05f529ba348cac150d33ab4cdb1e2cd9ce4" + sha256 cellar: :any, arm64_monterey: "2adae92ec142eb1aefa496b08ddc3632b3b0a57e3d44c5f561465039f6d29b43" + sha256 cellar: :any, sonoma: "c59ad39d07225b342bd493c1d4531082e2798f160bc33663487981a6b265bb5b" + sha256 cellar: :any, ventura: "9fa9786f28eb04e77dd3960bdf8e4674714b95d436183e9638cc646be0a19c8c" + sha256 cellar: :any, monterey: "137b0fb7b9dbc961eee2a9449e4fcdf6a7e631cb77be7e8aa5448d366ef001e5" + sha256 cellar: :any_skip_relocation, x86_64_linux: "320ed8b1cb2b9e3018fe2c524a8781936b62b55ec2de65e732c0a1c08117936f" end depends_on "ocaml-findlib" => :build depends_on "ocaml" def install + # Work around for https://github.com/Homebrew/homebrew-test-bot/issues/805 + if ENV["HOMEBREW_GITHUB_ACTIONS"] && !(Formula["ocaml-findlib"].etc/"findlib.conf").exist? + ENV["OCAMLFIND_CONF"] = Formula["ocaml-findlib"].opt_libexec/"findlib.conf" + end + ENV["OCAMLFIND_DESTDIR"] = lib/"ocaml" (lib/"ocaml").mkpath diff --git a/Formula/o/ocaml-zarith.rb b/Formula/o/ocaml-zarith.rb index c0c0b9daba35b..bc521ee206cd2 100644 --- a/Formula/o/ocaml-zarith.rb +++ b/Formula/o/ocaml-zarith.rb @@ -4,17 +4,16 @@ class OcamlZarith < Formula url "https://github.com/ocaml/Zarith/archive/refs/tags/release-1.13.tar.gz" sha256 "a5826d33fea0103ad6e66f92583d8e075fb77976de893ffdd73ada0409b3f83b" license "LGPL-2.0-only" + revision 1 bottle do - sha256 cellar: :any, arm64_sonoma: "30941c4d36a66cd0fdb3ba0204f4f93a18ee4a68d92d5952db4a5834f50321a9" - sha256 cellar: :any, arm64_ventura: "6ea3674d28c24ef63bbe635871fbac608eb8215370058e8bb067e52fac64ad31" - sha256 cellar: :any, arm64_monterey: "f19a7da2a824ac3881aeb88979badb774fd3f5181908b6280961b7bc7b031b9e" - sha256 cellar: :any, arm64_big_sur: "d79d6bb89cb272f3dbaed00db063e3e8e50de18b37a6e6193c69980d3a27f7a4" - sha256 cellar: :any, sonoma: "b5d882477447d006f8243de0c05f6bd9c9aa616fe695d3d61503c20fc81473a2" - sha256 cellar: :any, ventura: "2395358b13bed8bc9cf57f891bf9d3cf5576154df991869dbe7613ce1403e71a" - sha256 cellar: :any, monterey: "2dc837f6b5b386f2903d62b044736474561083c866727bf65b7fea8cbd7ed0a1" - sha256 cellar: :any, big_sur: "e062e7f558a9d3e4115126e5255d28908ee5800803d41fa5681119c75a2c94ab" - sha256 cellar: :any_skip_relocation, x86_64_linux: "b4133fea100b0af1214fb2fb9ba1db745f4ffb8702726b9744c153750f00948c" + sha256 cellar: :any, arm64_sonoma: "932642604c05ad5bb0d69c83b846263480e871dd637a07b25dadd3c9819dd282" + sha256 cellar: :any, arm64_ventura: "ebcdae625f98d18e5165ddd32a50ba524cbc65608d0eadfb7ace4d7a2ed48ac4" + sha256 cellar: :any, arm64_monterey: "94f18c52e35044939bc72ea6b318cc24b0a8dff9d0b224632fef51268a66f269" + sha256 cellar: :any, sonoma: "92762f6bd2138426c75811d46b6298aacf2a48796c1c74332369b52b69536634" + sha256 cellar: :any, ventura: "73bb4af9dd50aa6ca4c5be5b856e6d760279c14f3e8ec7950098b0718c405210" + sha256 cellar: :any, monterey: "ed57526ab3af9355aecd1990d5e142c825b135d10702465d23f125300bdd510c" + sha256 cellar: :any_skip_relocation, x86_64_linux: "c196a69f7ab0a5f9f03cdba4bf6be873cb49401a66c8d0fc84be5a846aa7662f" end depends_on "ocaml-findlib" => :build @@ -22,6 +21,11 @@ class OcamlZarith < Formula depends_on "ocaml" def install + # Work around for https://github.com/Homebrew/homebrew-test-bot/issues/805 + if ENV["HOMEBREW_GITHUB_ACTIONS"] && !(Formula["ocaml-findlib"].etc/"findlib.conf").exist? + ENV["OCAMLFIND_CONF"] = Formula["ocaml-findlib"].opt_libexec/"findlib.conf" + end + ENV["OCAMLFIND_DESTDIR"] = lib/"ocaml" (lib/"ocaml").mkpath diff --git a/Formula/o/ocaml.rb b/Formula/o/ocaml.rb index 1ef8e1e1fec4b..b21bb4c68dd15 100644 --- a/Formula/o/ocaml.rb +++ b/Formula/o/ocaml.rb @@ -13,35 +13,24 @@ class Ocaml < Formula desc "General purpose programming language in the ML family" homepage "https://ocaml.org/" + url "https://caml.inria.fr/pub/distrib/ocaml-5.1/ocaml-5.1.0.tar.xz" + sha256 "6ce8db393aafc264e5af731c68fbeb20920ab6ae84d5bf93511965b7423351ab" license "LGPL-2.1-only" => { with: "OCaml-LGPL-linking-exception" } head "https://github.com/ocaml/ocaml.git", branch: "trunk" - stable do - url "https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.0.tar.xz" - sha256 "36abd8cca53ff593d5e7cd8b98eee2f1f36bd49aaf6ff26dc4c4dd21d861ac2b" - - # Remove use of -flat_namespace. Upstreamed at - # https://github.com/ocaml/ocaml/pull/10723 - # We embed a patch here so we don't have to regenerate configure. - patch :DATA - end - livecheck do url "https://ocaml.org/releases" regex(%r{href=.*?/releases/v?(\d+(?:\.\d+)+)/?["']}i) end bottle do - sha256 cellar: :any, arm64_sonoma: "dcc146a9db508622eb064afe702178fc97faadb67f373377f17541711e7d6f6e" - sha256 cellar: :any, arm64_ventura: "fea680c0c2345edadc91fa0b9102ab2b1223a0f4312370a8fc4f917164f98e51" - sha256 cellar: :any, arm64_monterey: "4627e987e1517d78cfd6f40aa84a7f8c29b1d20ae845d345038fc7b548148413" - sha256 cellar: :any, arm64_big_sur: "dd4cddcad1dd890d90d2db3cd4119ec0dc8b30e10053ca480812e16a90dff342" - sha256 cellar: :any, sonoma: "4aff277d144252c0b5f68ccd386a05a2be1c50440f8ee72ae8dfd24c1b729f08" - sha256 cellar: :any, ventura: "a0a61f07a68cce8bbc534d8b3f87059390c1082bd0d0d050fa28c3b05075d239" - sha256 cellar: :any, monterey: "f744606227e8187baacabccec4baf57aca0f4309eb3bf93623a6789861369dab" - sha256 cellar: :any, big_sur: "bfff444bfd1a9f4c441087537e602964e19f00adad4a8b15b5e0aad522b0c1b3" - sha256 cellar: :any, catalina: "130c3b5d8c8de8cfbdafb57d48abf75a98e560c2ed4ae4bbc6f4a388145fe401" - sha256 cellar: :any_skip_relocation, x86_64_linux: "493cc9bbb57be2722ebf5203aa95fc93ec24af04cfadf474cbccba125dfbd215" + sha256 cellar: :any, arm64_sonoma: "c58b2daea7553f2276e006f833b49edf1d0e0ea4598552457db3f7d284f45ea8" + sha256 cellar: :any, arm64_ventura: "e74bcbd841101ac0f015593e03fb32e5f7c0d6893d187b3abb16306ea861360f" + sha256 cellar: :any, arm64_monterey: "8561604e9a2b36814efc882cedbff0a8faee43b98e86bd26b4677955143184c7" + sha256 cellar: :any, sonoma: "d26232128990896f2af0d49ddbb53487184582000451ce342e099edc05729712" + sha256 cellar: :any, ventura: "c38c39b1cad05df2ae44e87e369b8278f71d3fc82224224a409cd9f47c885135" + sha256 cellar: :any, monterey: "1218880aab20da9ad579134974eb0c915c68965de9348345c611b909f29f0ee5" + sha256 cellar: :any_skip_relocation, x86_64_linux: "c2e8fd353851e91aadd166cf0b7b737ddf19537917ca7ef6360df42042d73e9d" end # The ocaml compilers embed prefix information in weird ways that the default @@ -74,16 +63,3 @@ def install assert_match HOMEBREW_PREFIX.to_s, shell_output("#{bin}/ocamlc -where") end end - -__END__ ---- a/configure -+++ b/configure -@@ -14087,7 +14087,7 @@ if test x"$enable_shared" != "xno"; then : - case $host in #( - *-apple-darwin*) : - mksharedlib="$CC -shared \ -- -flat_namespace -undefined suppress -Wl,-no_compact_unwind \ -+ -undefined dynamic_lookup -Wl,-no_compact_unwind \ - \$(LDFLAGS)" - supports_shared_libraries=true ;; #( - *-*-mingw32) : diff --git a/Formula/o/ocaml@4.rb b/Formula/o/ocaml@4.rb new file mode 100644 index 0000000000000..1d908aefbfd9b --- /dev/null +++ b/Formula/o/ocaml@4.rb @@ -0,0 +1,77 @@ +# OCaml does not preserve binary compatibility across compiler releases, +# so when updating it you should ensure that all dependent packages are +# also updated by incrementing their revisions. +# +# Applications that really shouldn't break on a compiler update are: +# - coccinelle +class OcamlAT4 < Formula + desc "General purpose programming language in the ML family" + homepage "https://ocaml.org/" + url "https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.1.tar.xz" + sha256 "c127974d0242576cf47061b20aa9c86d17be0d6aa9687f6ec9835de67be7bb6f" + license "LGPL-2.1-only" => { with: "OCaml-LGPL-linking-exception" } + + livecheck do + url "https://ocaml.org/releases" + regex(%r{href=.*?/releases/v?(4(?:\.\d+)+)/?["']}i) + end + + bottle do + sha256 arm64_sonoma: "015d672de32d28f039ec897291e4c36803bcf562f3904fffecc17dbcd9f0aba6" + sha256 arm64_ventura: "a9b005aeb68d7e7cba4ddf72a2bd4d9683329e95dda048a002afc0f9ef23534b" + sha256 arm64_monterey: "71f5a84d9137a11012664e65d7282b57dc1eea163f5c4d8e14c02b1dbb5da58f" + sha256 sonoma: "18a84964e30800cb1ef70b1336c2ce0e5d8eec0b3b017f10e6699ba06346922e" + sha256 ventura: "d4513f0912c5e6eada78a425c8380b2c6fc06055c9ac2b0ad612d1105c3d01d0" + sha256 monterey: "7d10dfd426a35c0dfd07cd6cb5969c0b7d572176bd2d1d40b79e6e49b0500230" + sha256 x86_64_linux: "8412292973241a9951911a94cd1245f861a225a881ef08839815954ce4a276fd" + end + + # The ocaml compilers embed prefix information in weird ways that the default + # brew detection doesn't find, and so needs to be explicitly blocked. + pour_bottle? only_if: :default_prefix + + keg_only :versioned_formula + + # Fix -flat_namespace being used on Big Sur and later. + patch do + url "https://raw.githubusercontent.com/Homebrew/formula-patches/03cf8088210822aa2c1ab544ed58ea04c897d9c4/libtool/configure-big_sur.diff" + sha256 "35acd6aebc19843f1a2b3a63e880baceb0f5278ab1ace661e57a502d9d78c93c" + end + + # Remove use of -flat_namespace. Upstreamed at + # https://github.com/ocaml/ocaml/pull/10723 + # We embed a patch here so we don't have to regenerate configure. + patch :DATA + + def install + ENV.deparallelize # Builds are not parallel-safe, esp. with many cores + + # the ./configure in this package is NOT a GNU autoconf script! + args = %W[ + --prefix=#{prefix} + --enable-debug-runtime + --mandir=#{man} + ] + system "./configure", *args + system "make", "world.opt" + system "make", "prefix=#{prefix}", "install" + end + + test do + output = pipe_output("#{bin}/ocaml 2>&1", "let x = 1 ;;") + assert_match "val x : int = 1", output + end +end + +__END__ +--- a/configure ++++ b/configure +@@ -14087,7 +14087,7 @@ if test x"$enable_shared" != "xno"; then : + case $host in #( + *-apple-darwin*) : + mksharedlib="$CC -shared \ +- -flat_namespace -undefined suppress -Wl,-no_compact_unwind \ ++ -undefined dynamic_lookup -Wl,-no_compact_unwind \ + \$(LDFLAGS)" + supports_shared_libraries=true ;; #( + *-*-mingw32) : diff --git a/Formula/o/ott.rb b/Formula/o/ott.rb index 6cbb8901b0c35..4ea5ee1e33517 100644 --- a/Formula/o/ott.rb +++ b/Formula/o/ott.rb @@ -12,19 +12,17 @@ class Ott < Formula end bottle do - sha256 cellar: :any_skip_relocation, arm64_sonoma: "0a5e35c9d327cc655a2bc83d1f4467cec858b823ad3613cfc144a89c80c8caf4" - sha256 cellar: :any_skip_relocation, arm64_ventura: "0b202092d6fa42298024e584a97fd3349c500db3804857407c143656c5300699" - sha256 cellar: :any_skip_relocation, arm64_monterey: "511bf3f6279cba0c1714a9bcbc91b2b988b3407f5a9ffdcab04528bf1045a4a5" - sha256 cellar: :any_skip_relocation, arm64_big_sur: "9dfaa3e076ad777bb50da8904c52eb7742fb9158747d7f83bec71542f871972d" - sha256 cellar: :any_skip_relocation, sonoma: "73f4042a2cfd5ba7f176657954780a327c691ca6421863c3d7de2ba85044ad9c" - sha256 cellar: :any_skip_relocation, ventura: "9dba68010cc9178eb3933200efe0f7b4b358c79c62444b9a5f8733dd8868e0c1" - sha256 cellar: :any_skip_relocation, monterey: "09ae9f15978dce2f09f98d3ee1bd0ea77f53bf9872a9f2270a759abfc85b6a5e" - sha256 cellar: :any_skip_relocation, big_sur: "d80abf32c8153b5c72db279404531851fd09a5efdc6232c1d67bbf865dd8f73f" - sha256 cellar: :any_skip_relocation, catalina: "f2045c4dbc0ef48247e47274dbf546624fa68d46bd022e0a4365153f3c5e0275" - sha256 cellar: :any_skip_relocation, x86_64_linux: "0ca84d7f68137c731edd143156701f3abca196a1aacfc36120ec31b545549a55" + rebuild 1 + sha256 cellar: :any_skip_relocation, arm64_sonoma: "fd0f2fd9c600b741f4a67c547013f08904262e088af9c2bce6561f0e81c65118" + sha256 cellar: :any_skip_relocation, arm64_ventura: "4bcd637f28c7e9f35695e9c42f4f43085c61af9e2aa602ff27dc860a878bcba4" + sha256 cellar: :any_skip_relocation, arm64_monterey: "42c7e02e40e66fd3be87f2da780ceab61c2b2211b38a2f93a49d57ae844be70f" + sha256 cellar: :any_skip_relocation, sonoma: "91bc4fbcd4ba118ef1c2b5a7419c0791df3319784066cba6a3abe5137797ee91" + sha256 cellar: :any_skip_relocation, ventura: "866c6d30e404716a80a6903c02d981e00c638afc0648b81931302af9d8d9e3d8" + sha256 cellar: :any_skip_relocation, monterey: "04c5722ca0a6a51c3353e73a61dbab52e6fcf8aa7fd2171e459ff344ac27787c" + sha256 cellar: :any_skip_relocation, x86_64_linux: "80f076cb53a69044fd0007ccdae4998c2ed828ee432134c65a141a5bdb1a013a" end - depends_on "ocaml" => :build + depends_on "ocaml@4" => :build def install system "make", "world" diff --git a/Formula/s/stanc3.rb b/Formula/s/stanc3.rb index 839ddc60d6027..0c71bd02dc133 100644 --- a/Formula/s/stanc3.rb +++ b/Formula/s/stanc3.rb @@ -2,24 +2,25 @@ class Stanc3 < Formula desc "Stan transpiler" homepage "https://github.com/stan-dev/stanc3" # git is needed for dune subst + # TODO: Update `ocaml@4` dependency to `ocaml` on next release as OCaml 4.14 PR + # also adds support for OCaml 5: https://github.com/stan-dev/stanc3/pull/1366 url "https://github.com/stan-dev/stanc3.git", tag: "v2.32.2", revision: "bcbf83c52c76018ce4a6cd86233de1601ddf9422" license "BSD-3-Clause" bottle do - sha256 cellar: :any_skip_relocation, arm64_sonoma: "f419ea439932ee975ff481ef25e468592da68d0b0e18129c4180983c22227a8a" - sha256 cellar: :any_skip_relocation, arm64_ventura: "8b40bb946526bd9fca5832f864526e76de1445cac36e20b5a9855a256b43c7d1" - sha256 cellar: :any_skip_relocation, arm64_monterey: "d873cf39e57996a690c5a9b98a553c9c43c1b8b756a00067019626c6d77af7fa" - sha256 cellar: :any_skip_relocation, arm64_big_sur: "46609f4cff24ecd2d3b49ff95c7f748179d4c809bdce8e62f5d2bf77335dbffd" - sha256 cellar: :any_skip_relocation, sonoma: "3daf6d560ef1a7d772c42a05cc0da7c0584f50299a5cba5d2672e67fbfc45320" - sha256 cellar: :any_skip_relocation, ventura: "5e9f7124184ec9afe926f667d742838150befbfa803aba62918d02673e81d6b0" - sha256 cellar: :any_skip_relocation, monterey: "2052622b2ab8035d8fa5f9ee2004dabf1e450a3193857f4cbba35b679aa7f0ad" - sha256 cellar: :any_skip_relocation, big_sur: "2499e463f55f18225b4d79c942d1ccc0e747f42003176e58688a6e6c80dea998" - sha256 cellar: :any_skip_relocation, x86_64_linux: "5e684d8fd2b13d3d1f02fc304e8b6bf205288a8806fbdbbbfffc9ca10480465f" + rebuild 1 + sha256 cellar: :any_skip_relocation, arm64_sonoma: "8d5f37a394a5648cb71e93dc693b2ece5c8199b5f12b8fc67cca3f7914f385cd" + sha256 cellar: :any_skip_relocation, arm64_ventura: "92711699de011d8d0e2d1f3c9070a68359d8532bb839c3bfd85dd19d2e0757ef" + sha256 cellar: :any_skip_relocation, arm64_monterey: "7cfef591789f94cc42a791f525e152a66df28f38192bfbae89d02b38b716026e" + sha256 cellar: :any_skip_relocation, sonoma: "0129492246548c760cd4e443b90f332bb21a981e1c8d5b1837ae182fe2cfbf69" + sha256 cellar: :any_skip_relocation, ventura: "f738cab3f67f135b7d8ddad036afa0d197086aa0d6964aac385e3706aece60a6" + sha256 cellar: :any_skip_relocation, monterey: "10f98fb1d34c6a395d5922042f7d1aeeefcf2d1be5ecf691adc11daacdbfb1c2" + sha256 cellar: :any_skip_relocation, x86_64_linux: "653c73565c23ae031590a18bd3a9537bef7fff3f787450340e5332718d31de68" end - depends_on "ocaml" => :build + depends_on "ocaml@4" => :build depends_on "opam" => :build uses_from_macos "unzip" => :build