diff --git a/README.md b/README.md
index cfceeec2c41097bc219e1c4f69130c6921ef80e6..2cd24b178d09aef1b6fe140f1b9d2022033b30f7 100644
--- a/README.md
+++ b/README.md
@@ -505,7 +505,7 @@ cd $DYNAREDIR/x13as
curl -O https://www2.census.gov/software/x-13arima-seats/x13as/unix-linux/program-archives/x13as_asciisrc-v1-1-b59.tar.gz
tar xf x13as_asciisrc-v1-1-b59.tar.gz
sed -i '' 's/-static//g' makefile.gf
-make -j$(sysctl -n hw.ncpu) -f makefile.gf FC=$BREWDIR/bin/gfortran LINKER=$BREWDIR/bin/gcc-12 FFLAGS="-O2 -std=legacy" LDFLAGS=-static-libgcc LIBS="$BREWDIR/lib/gcc/current/libgfortran.a /$BREWDIR/lib/gcc/current/libquadmath.a" PROGRAM=x13as
+make -j$(sysctl -n hw.ncpu) -f makefile.gf FC=$BREWDIR/bin/gfortran LINKER=$BREWDIR/bin/gcc-13 FFLAGS="-O2 -std=legacy" LDFLAGS=-static-libgcc LIBS="$BREWDIR/lib/gcc/current/libgfortran.a /$BREWDIR/lib/gcc/current/libquadmath.a" PROGRAM=x13as
mkdir -p $HOME/.local/bin
cp x13as $HOME/.local/bin/x13as
cd ;
@@ -528,7 +528,7 @@ You can also choose a specific version of Dynare by checking out the correspondi
- Configure Dynare from the source directory:
```sh
-arch -$ARCH ./configure --prefix=$BREWDIR CC=gcc-12 CXX=g++-12 CPPFLAGS=-I$BREWDIR/include LDFLAGS=-L$BREWDIR/lib LEX=$BREWDIR/opt/flex/bin/flex YACC=$BREWDIR/opt/bison/bin/bison --with-slicot=$DYNAREDIR/slicot --with-matlab=/Applications/MATLAB_R2022b_Beta.app
+arch -$ARCH ./configure --prefix=$BREWDIR CC=gcc-13 CXX=g++-13 CPPFLAGS=-I$BREWDIR/include LDFLAGS=-L$BREWDIR/lib LEX=$BREWDIR/opt/flex/bin/flex YACC=$BREWDIR/opt/bison/bin/bison --with-slicot=$DYNAREDIR/slicot --with-matlab=/Applications/MATLAB_R2022b_Beta.app
```
where you need to adapt the path to MATLAB. If you don’t have MATLAB, simply replace `--with-matlab=<…>` by `--disable-matlab`.
Similarly, if you don't want to compile for Octave add a `--disable-octave` flag.
@@ -563,4 +563,4 @@ So if you want to use system commands like `pdflatex` or `x13as` you should eith
Alternatively, you can create a `startup.m` file or change the system default PATH in the `/etc/paths` file.
Last tested on:
-- macOS Ventura 13.3.1 (MacBook Air M1, MacBook Pro M2 MAX, M2 Virtual Machine using Parallels, Intel Virtual Machine using Quickemu)
\ No newline at end of file
+- macOS Ventura 13.3.1 (MacBook Air M1, MacBook Pro M2 MAX, M2 Virtual Machine using Parallels, Intel Virtual Machine using Quickemu)
diff --git a/doc/manual/source/installation-and-configuration.rst b/doc/manual/source/installation-and-configuration.rst
index 47bb894b0203001811ce4b16ea325a71d67a92f7..eab088734788eff16cbddeda5b40f8132defe021 100644
--- a/doc/manual/source/installation-and-configuration.rst
+++ b/doc/manual/source/installation-and-configuration.rst
@@ -200,7 +200,7 @@ With Octave
The compiler can be installed via Homebrew_. In a terminal, run::
- brew install gcc-12
+ brew install gcc
Configuration
=============
diff --git a/macOS/brewfiles/gcc.rb b/macOS/brewfiles/gcc.rb
index 037597fe0cc010229f743d49d41b3e4e3c3310fb..d636f85d5d702a160c44d5dabb5967223003dea9 100644
--- a/macOS/brewfiles/gcc.rb
+++ b/macOS/brewfiles/gcc.rb
@@ -5,15 +5,15 @@ class Gcc < Formula
head "https://gcc.gnu.org/git/gcc.git", branch: "master"
stable do
- url "https://ftp.gnu.org/gnu/gcc/gcc-12.2.0/gcc-12.2.0.tar.xz"
- mirror "https://ftpmirror.gnu.org/gcc/gcc-12.2.0/gcc-12.2.0.tar.xz"
- sha256 "e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff"
+ url "https://ftp.gnu.org/gnu/gcc/gcc-13.1.0/gcc-13.1.0.tar.xz"
+ mirror "https://ftpmirror.gnu.org/gcc/gcc-13.1.0/gcc-13.1.0.tar.xz"
+ sha256 "61d684f0aa5e76ac6585ad8898a2427aade8979ed5e7f85492286c4dfc13ee86"
# Branch from the Darwin maintainer of GCC, with a few generic fixes and
- # Apple Silicon support, located at https://github.com/iains/gcc-12-branch
+ # Apple Silicon support, located at https://github.com/iains/gcc-13-branch
patch do
- url "https://raw.githubusercontent.com/Homebrew/formula-patches/1d184289/gcc/gcc-12.2.0-arm.diff"
- sha256 "a7843b5c6bf1401e40c20c72af69c8f6fc9754ae980bb4a5f0540220b3dcb62d"
+ url "https://raw.githubusercontent.com/Homebrew/formula-patches/5c206c47/gcc/gcc-13.1.0.diff"
+ sha256 "cb4e8a89387f748a744da0273025d0dc2e3c76780cc390b18ada704676afea11"
end
end
@@ -23,13 +23,13 @@ class Gcc < Formula
end
bottle do
- rebuild 1
- sha256 cellar: :any, arm64_monterey: "f37b8d3764f63e11a6e11dc23774eba527453de89fedb4e3b13aa3996059d386"
- sha256 cellar: :any, arm64_big_sur: "5d98731c711f17707fe13276090a6a3669a9d68e766e56ead8c842465ff164bb"
- sha256 cellar: :any, monterey: "453199069048503be8f072463aaa3cd60fc2764875528f234374872354528564"
- sha256 cellar: :any, big_sur: "1f2aca239e706f455125dcb2c08df7744b8905b5b62d7aed4cdeae6cf5d5fcee"
- sha256 cellar: :any, catalina: "98f37e3468e2a15343e02f613a2f8d7761d30eead960d04b2317f8292122e9ac"
- sha256 cellar: :any_skip_relocation, x86_64_linux: "c7f773f9af560766b2d971d815a8d224c267088c05ed1f2b864bd1d9ebc26e1a"
+ sha256 cellar: :any, arm64_ventura: "d2b21a257c73e9b8f9c6bc03e6330ea8ba9fb3e7cdb9eb945d7ff7d96ba9708c"
+ sha256 cellar: :any, arm64_monterey: "5405f3b1ecdabb68e161308f35d72af907af21694a0e2b67f10edb25b2dd8f90"
+ sha256 cellar: :any, arm64_big_sur: "cc92fced3516bc72b69e31b0495fe416f206b540be02f1c817db96afbcc38f28"
+ sha256 cellar: :any, ventura: "3abd8c2c88a8e74b5df5c44f9c151ff7e760cf705307ecf3c95762492e777f1e"
+ sha256 cellar: :any, monterey: "f9cbc7eb14781df9228518a2d02590941206947e7dc419c0b232d523f39b1475"
+ sha256 cellar: :any, big_sur: "2eb458ed309ea4fa9451ab547fa3d797bd523ba4f50f01d5c997212109b74e5e"
+ sha256 cellar: :any_skip_relocation, x86_64_linux: "cca77a5d6625d3bb711ce40551751974d4cb5c74306329fc2fc8cdcade2ef564"
end
# The bottles are built on systems with the CLT installed, and do not work
@@ -104,6 +104,9 @@ class Gcc < Formula
# Fix Linux error: gnu/stubs-32.h: No such file or directory.
args << "--disable-multilib"
+ # Enable to PIE by default to match what the host GCC uses
+ args << "--enable-default-pie"
+
# Change the default directory name for 64-bit libraries to `lib`
# https://stackoverflow.com/a/54038769
inreplace "gcc/config/i386/t-linux64", "m64=../lib64", "m64="
@@ -204,8 +207,8 @@ class Gcc < Formula
# * `-idirafter <dir>` instructs gcc to search system header
# files after gcc internal header files.
# For libraries:
- # * `-nostdlib -L#{libgcc}` instructs gcc to use brewed glibc
- # if applied.
+ # * `-nostdlib -L#{libgcc} -L#{glibc.opt_lib}` instructs gcc to use
+ # brewed glibc if applied.
# * `-L#{libdir}` instructs gcc to find the corresponding gcc
# libraries. It is essential if there are multiple brewed gcc
# with different versions installed.
@@ -219,7 +222,7 @@ class Gcc < Formula
+ -isysroot #{HOMEBREW_PREFIX}/nonexistent #{system_header_dirs.map { |p| "-idirafter #{p}" }.join(" ")}
*link_libgcc:
- #{glibc_installed ? "-nostdlib -L#{libgcc}" : "+"} -L#{libdir} -L#{HOMEBREW_PREFIX}/lib
+ #{glibc_installed ? "-nostdlib -L#{libgcc} -L#{glibc.opt_lib}" : "+"} -L#{libdir} -L#{HOMEBREW_PREFIX}/lib
*link:
+ --dynamic-linker #{HOMEBREW_PREFIX}/lib/ld.so -rpath #{libdir}
diff --git a/macOS/brewfiles/gmp.rb b/macOS/brewfiles/gmp.rb
index 9aad4f70856f0f5f7f262b858714718aa266668f..e210d4840e55881cf52818c9b8a41e0f37813b93 100644
--- a/macOS/brewfiles/gmp.rb
+++ b/macOS/brewfiles/gmp.rb
@@ -22,8 +22,10 @@ class Gmp < Formula
end
bottle do
+ sha256 cellar: :any, arm64_ventura: "2436cd120e5678d67c24020a50cbbf7c0220e7ecaac63981335872b9d666bcad"
sha256 cellar: :any, arm64_monterey: "a43a2ae4c44d90626b835a968a32327c8b8bbf754ec1d2590f8ac656c71dace9"
sha256 cellar: :any, arm64_big_sur: "491220f1ff2c662b96295d931a80702523eeaee681d7305fb02b561e527dcbb8"
+ sha256 cellar: :any, ventura: "4c6488dfd53b8287702827a4e6d50569926417f2cd08613d37720de54b6afe0c"
sha256 cellar: :any, monterey: "dddc6d8c871c92f6e5fb1249c28768aa2b4b47c38836a69cf787a639cf5eee73"
sha256 cellar: :any, big_sur: "e566452815d2ff5dc66da160bd1cd3d9cf02a17a07284cf0bac46496133383ae"
sha256 cellar: :any, catalina: "5ee7a460668864c28e541db15420e1480c3d31c5f216797a453a5310106fbc97"
diff --git a/macOS/brewfiles/isl.rb b/macOS/brewfiles/isl.rb
index 84038d63a898bdb920adcda1a45765dd15e33e48..474fb6ba3d322d11bac7dc0366c72d52174e6f9e 100644
--- a/macOS/brewfiles/isl.rb
+++ b/macOS/brewfiles/isl.rb
@@ -1,37 +1,29 @@
class Isl < Formula
+ # NOTE: Always use tarball instead of git tag for stable version.
+ #
+ # Currently isl detects its version using source code directory name
+ # and update isl_version() function accordingly. All other names will
+ # result in isl_version() function returning "UNKNOWN" and hence break
+ # package detection.
desc "Integer Set Library for the polyhedral model"
homepage "https://libisl.sourceforge.io/"
+ url "https://libisl.sourceforge.io/isl-0.26.tar.xz"
+ sha256 "a0b5cb06d24f9fa9e77b55fabbe9a3c94a336190345c2555f9915bb38e976504"
license "MIT"
- stable do
- # NOTE: Always use tarball instead of git tag for stable version.
- #
- # Currently isl detects its version using source code directory name
- # and update isl_version() function accordingly. All other names will
- # result in isl_version() function returning "UNKNOWN" and hence break
- # package detection.
- url "https://libisl.sourceforge.io/isl-0.25.tar.xz"
- sha256 "be7b210647ccadf90a2f0b000fca11a4d40546374a850db67adb32fad4b230d9"
-
- # 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
- end
-
livecheck do
url :homepage
regex(/href=.*?isl[._-]v?(\d+(?:\.\d+)+)\.t/i)
end
bottle do
- sha256 cellar: :any, arm64_monterey: "764bde8aa0d015c13cbf53891489f3ef56a5951f617ad9906aea34382dc1f4d1"
- sha256 cellar: :any, arm64_big_sur: "24f86a50eea8a2d4dbc24ecb5f8b8ded61f6f7cd7054886b5dafcb82854b28ed"
- sha256 cellar: :any, monterey: "568dd08209728ad3a036cf45287ff8384b9ed821460a216a9a79fa80fdcfbf52"
- sha256 cellar: :any, big_sur: "be6456799bb670c16115d89feacf72cee9b444fe87aca6b1bd350bfb89ff6247"
- sha256 cellar: :any, catalina: "c2ccd96c92ab0bbfdb775ccd7c8f20c2057cbe976769cf078e728b6f5f5938bc"
- sha256 cellar: :any_skip_relocation, x86_64_linux: "c0244c95ed9cc89b826868de83bec3150fcc120add1265017176770150757083"
+ sha256 cellar: :any, arm64_ventura: "1814fe867c61b34cd5c763cf2ebda99d7883db78348c8b663f98cc95a1348d16"
+ sha256 cellar: :any, arm64_monterey: "0a3e83c458420e4b469ad7464d16d6c9cd26a888059358eb5f1f9d3cff54bbd7"
+ sha256 cellar: :any, arm64_big_sur: "a68a647249ad644cd8d1e1057bac65e5b4e1e08f9adaf15a07121853b0ed40cc"
+ sha256 cellar: :any, ventura: "0301489db7b26967657be0f6c89f11ea7e1e5fb50631686f86c597b01c00dc85"
+ sha256 cellar: :any, monterey: "0dcc555fd2517c6c93bca8999c741029bbdd821bfeb397505ec1f98deb79c551"
+ sha256 cellar: :any, big_sur: "91965ce2f54c7d1b16747ed05de989a3a122f5dbee67546bbf9bf065873b13c5"
+ sha256 cellar: :any_skip_relocation, x86_64_linux: "db14ba1e4ea23ab41e06930dcf25ae9023c5e395c88602da2a9b6a98d54c92d3"
end
head do
diff --git a/macOS/brewfiles/libmpc.rb b/macOS/brewfiles/libmpc.rb
index d987cd74c5a50570f7e6afc5ed7f85934dce6dee..8ce93a32b0b4c10b2df39a8bd439335e885f0103 100644
--- a/macOS/brewfiles/libmpc.rb
+++ b/macOS/brewfiles/libmpc.rb
@@ -1,33 +1,23 @@
class Libmpc < Formula
desc "C library for the arithmetic of high precision complex numbers"
homepage "http://www.multiprecision.org/mpc/"
+ url "https://ftp.gnu.org/gnu/mpc/mpc-1.3.1.tar.gz"
+ mirror "https://ftpmirror.gnu.org/mpc/mpc-1.3.1.tar.gz"
+ sha256 "ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8"
license "LGPL-3.0-or-later"
- stable do
- url "https://ftp.gnu.org/gnu/mpc/mpc-1.2.1.tar.gz"
- mirror "https://ftpmirror.gnu.org/mpc/mpc-1.2.1.tar.gz"
- sha256 "17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459"
-
- # 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
- end
-
bottle do
- sha256 cellar: :any, arm64_monterey: "658a1d260b6f77c431451a554ef8fa36ea2b6db19b38adc05c52821598ce2647"
- sha256 cellar: :any, arm64_big_sur: "6a93bd78c1b55f8b29e11fd1e9c68c6c305ffe74aa5b978ba93189b6d84d1451"
- sha256 cellar: :any, monterey: "b9984a72544255edf0c2d36dcb75d6adb7e68aa97233b005cf4120b36bb1fe6b"
- sha256 cellar: :any, big_sur: "754667644cc287cd9691fd3215df260aa971562b5a7b6ca65e29b2e15ea1e656"
- sha256 cellar: :any, catalina: "8c037df4b551058d00351676dc2c5ec395bd69c88545fac9ccfd0749dadb8ee2"
- sha256 cellar: :any, mojave: "c229b6def61f4acc41b4b159d93dbc63a5c77f87f61623c9f7c5399da440cc4f"
- sha256 cellar: :any, high_sierra: "939f0ad01d809356e33bdc70a8a8483eb1b021fd5f3723d0e61a2698af00f01b"
- sha256 cellar: :any_skip_relocation, x86_64_linux: "d74eb5f1377d8fa72fad88baca1bd5f00c29d45ba186fbec89ad690c1d1f721f"
+ sha256 cellar: :any, arm64_ventura: "da4ff781bc469c82af17f98f0bdbf20932e222d0520ab784cd1b322b789ad7a5"
+ sha256 cellar: :any, arm64_monterey: "dd3994160b3625b1f14e34abf632b90bf49e71db1cc85c12e9ab529d4cae2a87"
+ sha256 cellar: :any, arm64_big_sur: "43bbe994c7bbb40f7172ef7a750bc6d2687275a76a25f67fc2d53ef00728d912"
+ sha256 cellar: :any, ventura: "aa4ddb0e50ace93746e6af2e6185493698b501e9359cf73ce41cfbb70369db09"
+ sha256 cellar: :any, monterey: "c32f2c3fe7ab06e308e6fa74874e1d4d92ff6eb3598da6e0f8e6fa7a333350f5"
+ sha256 cellar: :any, big_sur: "47b50c3df6a35ea3c876397eac4a7dc157b5f4109247671a16599a9a41b9c035"
+ sha256 cellar: :any_skip_relocation, x86_64_linux: "f6542ae5bcf643ca0c980c7000cde1585922e76be080b3cc3422dac0d4a50904"
end
head do
- url "https://gitlab.inria.fr/mpc/mpc.git"
+ url "https://gitlab.inria.fr/mpc/mpc.git", branch: "master"
depends_on "autoconf" => :build
depends_on "automake" => :build
depends_on "libtool" => :build
@@ -37,15 +27,10 @@ class Libmpc < Formula
depends_on "mpfr"
def install
- args = %W[
- --prefix=#{prefix}
- --disable-dependency-tracking
- --with-gmp=#{Formula["gmp"].opt_prefix}
- --with-mpfr=#{Formula["mpfr"].opt_prefix}
- ]
-
- system "autoreconf", "-fiv" if build.head?
- system "./configure", *args
+ system "autoreconf", "--force", "--install", "--verbose" if build.head?
+ system "./configure", *std_configure_args,
+ "--with-gmp=#{Formula["gmp"].opt_prefix}",
+ "--with-mpfr=#{Formula["mpfr"].opt_prefix}"
system "make"
system "make", "check"
system "make", "install"
diff --git a/macOS/brewfiles/mpfr.rb b/macOS/brewfiles/mpfr.rb
index f51f3d34dcabf22c7edb062ce005e79fc5fb479d..06c6b579a40c3f9eabc183aa9e676bc6f99a9136 100644
--- a/macOS/brewfiles/mpfr.rb
+++ b/macOS/brewfiles/mpfr.rb
@@ -4,30 +4,59 @@ class Mpfr < Formula
license "LGPL-3.0-or-later"
stable do
- url "https://ftp.gnu.org/gnu/mpfr/mpfr-4.1.0.tar.xz"
- mirror "https://ftpmirror.gnu.org/mpfr/mpfr-4.1.0.tar.xz"
- sha256 "0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f"
+ url "https://ftp.gnu.org/gnu/mpfr/mpfr-4.2.0.tar.xz"
+ mirror "https://ftpmirror.gnu.org/mpfr/mpfr-4.2.0.tar.xz"
+ sha256 "06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993"
+ version "4.2.0-p9"
- # 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"
+ # Upstream patches, list at https://www.mpfr.org/mpfr-current/#fixed
+ %w[
+ 01 2e465c31689e780a93b24bf2959917443fb882da85b7f1ef23ae53d3de614aa4
+ 02 e1ef3d4dab999f4e0ad5ee046c3a2823d3a9395fb8092c3dcb85d3fe29994b52
+ 03 a906f9ed8e4a7230980322a0154702664164690614e5ff55ae7049c3fae55584
+ 04 ece14ee57596dc2e4f67d2e857c5c6b23d76b20183a50a8b6759b640df001b78
+ 05 c4144564097a1be89c9cc2e7ee255c9fe59eb1b94a17c9d4a08169223e705ac1
+ 06 70456748a8072265ba103d93ba94e9f93ae64565e6a5742194c56030086540fa
+ 07 472386aa5f8c51fbdf60154c19268ce2212be03e1c2f9004c1673b6c270508f6
+ 08 6ecd3bd2edf178f4ede4be612964d1b2d0a0bb10ad6f8c51d1a8011fff87d5ea
+ 09 3e9aed5bcea95d34d0bd179a61cd7acb712c89c9a745535f18f0ef619833ba3b
+ ].each_slice(2) do |p, checksum|
+ patch do
+ url "https://www.mpfr.org/mpfr-4.2.0/patch#{p}"
+ sha256 checksum
+ end
+ end
+ end
+
+ livecheck do
+ url "https://www.mpfr.org/mpfr-current/"
+ regex(/href=.*?mpfr[._-]v?(\d+(?:\.\d+)+)\.t/i)
+ strategy :page_match do |page, regex|
+ version = page.scan(regex).map { |match| Version.new(match[0]) }.max&.to_s
+ next if version.blank?
+
+ patch = page.scan(%r{href=["']?/?patch(\d+)["' >]}i)
+ .map { |match| Version.new(match[0]) }
+ .max
+ &.to_s
+ next version if patch.blank?
+
+ "#{version}-p#{patch.to_i}"
end
end
bottle do
- sha256 cellar: :any, arm64_monterey: "81ced499f237acfc2773711a3f8aa985572eaab2344a70485c06f72405e4a5e7"
- sha256 cellar: :any, arm64_big_sur: "9df11560dd3650ffae35c134cef6e0e91aad0e862f5c8895c568b828cf0598d5"
- sha256 cellar: :any, monterey: "7eb2f42b8f39d4f721620d1d54417e27fdb93c993e3ffd7e6ad43310cd84de1b"
- sha256 cellar: :any, big_sur: "1e8eb0326f62d3461d420d98af6fc088daca481cae89fd77a75b420d2e76d776"
- sha256 cellar: :any, catalina: "5fcf57834f58c18761c6c7b0eb961eb7f9fc54325b5361bf3a17c4dee6ebc08a"
- sha256 cellar: :any, mojave: "93c0d2ca093819f125300002cd34c1d1b4dfb7a1403729205861bec21388ff12"
- sha256 cellar: :any, high_sierra: "77581a1df66fb1ef55ffb19777d08b0b60fbc3d2d7ad491a8aceb3a6a4bf7ffd"
- sha256 cellar: :any_skip_relocation, x86_64_linux: "4c5f1cfd038e8fbd640795e34e5e23c11244be3eca7781979600ec0d50bb9c0b"
+ sha256 cellar: :any, arm64_ventura: "176114984411aeb1187a50fd9ffc39d7dfe0bf5dc29ab13b0ecc95307d619ff9"
+ sha256 cellar: :any, arm64_monterey: "77a979ab547618549fc85a12212abd57b085b1712c53299847966d76a4e261f9"
+ sha256 cellar: :any, arm64_big_sur: "f5776604dbb68288c8dfe371e46398a671b6c34329ad473ada5d4e1fa7562086"
+ sha256 cellar: :any, ventura: "781d9c4887b8b18ccb96653ce59bb9aa5ee49dd1fb6c7d804750f58ce8726a2f"
+ sha256 cellar: :any, monterey: "a8eb9e75c01527d80843daba945a7581942362e689e3f3b7c6c891daa2655e9e"
+ sha256 cellar: :any, big_sur: "22360e6d89681f3d3d326a5654ab0cfb22d5ac42241c40e9f8f91eb06bb1b77c"
+ sha256 cellar: :any_skip_relocation, x86_64_linux: "d0cafd93a5957220615ae6478033031b750ba5eb6a830cf86d4cbde5bffec8d5"
end
head do
- url "https://gitlab.inria.fr/mpfr/mpfr.git"
+ url "https://gitlab.inria.fr/mpfr/mpfr.git", branch: "master"
depends_on "autoconf" => :build
depends_on "automake" => :build
depends_on "libtool" => :build
@@ -50,16 +79,18 @@ class Mpfr < Formula
#include <mpfr.h>
#include <math.h>
#include <stdlib.h>
+ #include <string.h>
int main() {
mpfr_t x, y;
mpfr_inits2 (256, x, y, NULL);
mpfr_set_ui (x, 2, MPFR_RNDN);
- mpfr_root (y, x, 2, MPFR_RNDN);
+ mpfr_rootn_ui (y, x, 2, MPFR_RNDN);
mpfr_pow_si (x, y, 4, MPFR_RNDN);
mpfr_add_si (y, x, -4, MPFR_RNDN);
mpfr_abs (y, y, MPFR_RNDN);
if (fabs(mpfr_get_d (y, MPFR_RNDN)) > 1.e-30) abort();
+ if (strcmp("#{version}", mpfr_get_version())) abort();
return 0;
}
EOS
diff --git a/macOS/brewfiles/zstd.rb b/macOS/brewfiles/zstd.rb
index 55ebf6b62aacecd5c4b01cac04a3371c2fa39bbe..09f2d358ed2a742d52a63962efef923b32b4002c 100644
--- a/macOS/brewfiles/zstd.rb
+++ b/macOS/brewfiles/zstd.rb
@@ -1,21 +1,26 @@
class Zstd < Formula
desc "Zstandard is a real-time compression algorithm"
homepage "https://facebook.github.io/zstd/"
- url "https://github.com/facebook/zstd/archive/v1.5.2.tar.gz"
- mirror "http://fresh-center.net/linux/misc/zstd-1.5.2.tar.gz"
- mirror "http://fresh-center.net/linux/misc/legacy/zstd-1.5.2.tar.gz"
- sha256 "f7de13462f7a82c29ab865820149e778cbfe01087b3a55b5332707abf9db4a6e"
+ url "https://github.com/facebook/zstd/archive/v1.5.5.tar.gz"
+ mirror "http://fresh-center.net/linux/misc/zstd-1.5.5.tar.gz"
+ mirror "http://fresh-center.net/linux/misc/legacy/zstd-1.5.5.tar.gz"
+ sha256 "98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1"
license "BSD-3-Clause"
head "https://github.com/facebook/zstd.git", branch: "dev"
+ livecheck do
+ url :stable
+ regex(/^v?(\d+(?:\.\d+)+)$/i)
+ end
+
bottle do
- rebuild 3
- sha256 cellar: :any, arm64_monterey: "844b957a277cd93f70f8de91bd4caa21579f9b9e2f55bd5daf0334eee8ef1196"
- sha256 cellar: :any, arm64_big_sur: "091743749cec2f0ae34482ae370aa5a563d6c7841c42fbc25e0d061863f5faa5"
- sha256 cellar: :any, monterey: "b0eabfa556c5aed039a5b22cd7e2e3dd52c7d2416c1141e4a8e9e825b9238fc3"
- sha256 cellar: :any, big_sur: "585bced60a658bfbda88d6a500fa26671871aa354f65cef767f17ea46209b4f2"
- sha256 cellar: :any, catalina: "bdd2d3349fbcaa7e299cb6184f43e7f2bf29bd5936396d4c7c3d132bd687cd15"
- sha256 cellar: :any_skip_relocation, x86_64_linux: "006b5ab6a4616a8b6f59953cb9efb546d312e3ba231c303bb56749e7f66f56df"
+ sha256 cellar: :any, arm64_ventura: "b709835f4cd5d339b97103f0dfa343489a02d2073f8e80ba7b04d682f1d29bd4"
+ sha256 cellar: :any, arm64_monterey: "e3cb579108afe4794143b33f24b6020648ca166f0104eb3d13cee56da62c949f"
+ sha256 cellar: :any, arm64_big_sur: "faf929cf92dad72eca2b16fb5aedb695f5d291aac18b496061b8b14003b2e224"
+ sha256 cellar: :any, ventura: "e4eb8cc0473c699ec424bfecc67fcfd30631f7fe5eacf26c727bfed73dcf7c12"
+ sha256 cellar: :any, monterey: "9c1cfe9158a48f6bd3eeb92608ed2799a048d1d27e70e7acef82d5eb4a7a1cea"
+ sha256 cellar: :any, big_sur: "73d78b5fef5ba31d3c37b8201310fe042f30c6000a97b8ba0d91208e1e1de231"
+ sha256 cellar: :any_skip_relocation, x86_64_linux: "68c8655224f058316c16462507b6cdd061bd546e161bf8419c68ca526d3a9a48"
end
depends_on "cmake" => :build
@@ -35,6 +40,7 @@ class Zstd < Formula
"-DZSTD_ZLIB_SUPPORT=ON",
"-DZSTD_LZMA_SUPPORT=ON",
"-DZSTD_LZ4_SUPPORT=ON",
+ "-DCMAKE_CXX_STANDARD=11",
*std_cmake_args
system "cmake", "--build", "builddir"
system "cmake", "--install", "builddir"
diff --git a/macOS/build.sh b/macOS/build.sh
index 76b34808fcbd628186c73c0408e78c6dfb98f89a..30e8c7abe3f42e9db93cf019158f91783036c62c 100755
--- a/macOS/build.sh
+++ b/macOS/build.sh
@@ -22,7 +22,7 @@ set -ex
ROOTDIR=$(pwd)/..
# Set the GCC version
-GCC_VERSION=12
+GCC_VERSION=13
# Set the compilers
CC=gcc-$GCC_VERSION
diff --git a/macOS/deps/Makefile b/macOS/deps/Makefile
index 42f511c93a14aceb493d053dbdd02ec4382f29ca..5b08d657760bbbd02cd5bb4a13d4d2ef2e73f258 100644
--- a/macOS/deps/Makefile
+++ b/macOS/deps/Makefile
@@ -1,4 +1,4 @@
-# Copyright © 2019-2022 Dynare Team
+# Copyright © 2019-2023 Dynare Team
#
# This file is part of Dynare.
#
@@ -17,7 +17,7 @@
include versions.mk
-GCC_VERSION = 12
+GCC_VERSION = 13
ROOT_PATH = $(realpath .)
WGET_OPTIONS := --no-verbose --no-use-server-timestamps --retry-connrefused --retry-on-host-error
diff --git a/preprocessor b/preprocessor
index 3cc531315bd5abe5fe9d53145ec3c3de6723f1e0..0de27e8dab9c4190be17ea8642cf301844c8043a 160000
--- a/preprocessor
+++ b/preprocessor
@@ -1 +1 @@
-Subproject commit 3cc531315bd5abe5fe9d53145ec3c3de6723f1e0
+Subproject commit 0de27e8dab9c4190be17ea8642cf301844c8043a