Skip to content

Commit 0dbfbad

Browse files
authored
Merge pull request #246213 from Homebrew/dynare-test
dynare: remove `-ld_classic` in test for Ventura
2 parents 520c1be + fae8b89 commit 0dbfbad

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

Formula/d/dynare.rb

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Dynare < Formula
3030
depends_on "ninja" => :build
3131
depends_on "pkgconf" => :build
3232
depends_on "fftw"
33-
depends_on "gcc"
33+
depends_on "gcc" # for gfortran
3434
depends_on "gsl"
3535
depends_on "hdf5"
3636
depends_on "libmatio"
@@ -66,7 +66,8 @@ def install
6666
octave = Formula["octave"]
6767
ENV.append "LDFLAGS", "-Wl,-rpath,#{octave.opt_lib}/octave/#{octave.version.major_minor_patch}" if OS.linux?
6868

69-
# Help meson find `suite-sparse` and `slicot`
69+
# Help meson find `boost`, `suite-sparse` and `slicot`
70+
ENV["BOOST_ROOT"] = Formula["boost"].opt_prefix
7071
ENV.append_path "LIBRARY_PATH", Formula["suite-sparse"].opt_lib
7172
ENV.append_path "LIBRARY_PATH", buildpath/"slicot/lib"
7273

@@ -93,12 +94,6 @@ def caveats
9394
ENV.append "CXXFLAGS", "-std=c++17" # octave >= 10 requires c++17
9495
ENV.delete "LDFLAGS" # avoid overriding Octave flags
9596

96-
# Work around Xcode 15.0 ld error with GCC: https://github.com/Homebrew/homebrew-core/issues/145991
97-
if OS.mac? && (MacOS::Xcode.version.to_s.start_with?("15.0") || MacOS::CLT.version.to_s.start_with?("15.0"))
98-
ENV["LDFLAGS"] = shell_output("#{Formula["octave"].opt_bin}/mkoctfile --print LDFLAGS").chomp
99-
ENV.append "LDFLAGS", "-Wl,-ld_classic"
100-
end
101-
10297
statistics = resource("statistics")
10398
testpath.install statistics
10499

0 commit comments

Comments
 (0)