From a8a7012ec1dee49a4dadb70496eca2619bb625a9 Mon Sep 17 00:00:00 2001 From: Mitchell Blank Jr Date: Thu, 18 Feb 2021 20:05:21 +0000 Subject: [PATCH] nvc: go back to using default llvm as dependency The restriction on building against llvm@6 (later updated to llvm@7) was introduced by @jnozsc (#54741) However the issue that was referenced was fixed before 1.5.0 was released... https://github.com/nickg/nvc/commit/f48c651eeb08ba273610fff57c71d24990ec7c34 ...so when homebrew updated to 1.5.0 this restriction should probably be dropped. According to the project's README it is tested with llvm {7,8,9} so at a minimum we should probably bump its dependency to llvm@9. However, this wouldn't be enough to fix the Big Sur bottling issue. Nothing in the project's build instructions suggests that llvm versions newer than 9.x are to be avoided these days so just switching to our default llvm (currently 11.1) instead. Seems to build and test fine. --- Formula/nvc.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Formula/nvc.rb b/Formula/nvc.rb index a56e8d0e68e67..83bb851b7407d 100644 --- a/Formula/nvc.rb +++ b/Formula/nvc.rb @@ -3,8 +3,8 @@ class Nvc < Formula homepage "https://github.com/nickg/nvc" url "https://github.com/nickg/nvc/releases/download/r1.5.0/nvc-1.5.tar.gz" sha256 "4da984ba95eb3b8dd2893fb7a676675de869ff114b827a9f5490dfd54bc95fcb" - license "GPL-3.0" - revision 1 + license "GPL-3.0-or-later" + revision 2 bottle do sha256 catalina: "7ba6e4a374fa45ac6727a3a94b68ec1e317989999aeace6e16e2d2374f1adef9" @@ -21,8 +21,7 @@ class Nvc < Formula depends_on "check" => :build depends_on "pkg-config" => :build - # llvm 8+ is not supported https://github.com/nickg/nvc/commit/c3d1ae5700cfba6070293ad1bb5a6c198c631195 - depends_on "llvm@7" + depends_on "llvm" resource "vim-hdl-examples" do url "https://github.com/suoto/vim-hdl-examples.git", @@ -32,7 +31,7 @@ class Nvc < Formula def install system "./autogen.sh" if build.head? system "./tools/fetch-ieee.sh" - system "./configure", "--with-llvm=#{Formula["llvm@7"].opt_bin}/llvm-config", + system "./configure", "--with-llvm=#{Formula["llvm"].opt_bin}/llvm-config", "--prefix=#{prefix}", "--with-system-cc=/usr/bin/clang" system "make"