From ffe1a12e7b1315dded26cb2abbbab8c80ecf2bfa Mon Sep 17 00:00:00 2001 From: xq114 <1140735506@qq.com> Date: Tue, 27 Aug 2024 15:55:10 +0800 Subject: [PATCH] add gfortran dep --- .github/workflows/macos_arm64.yml | 2 ++ .github/workflows/macos_x86_64.yml | 2 ++ packages/s/scotch/xmake.lua | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos_arm64.yml b/.github/workflows/macos_arm64.yml index a551c168742..3f728a5185b 100644 --- a/.github/workflows/macos_arm64.yml +++ b/.github/workflows/macos_arm64.yml @@ -30,4 +30,6 @@ jobs: run: | wget https://curl.haxx.se/ca/cacert.pem -O /tmp/cacert.pem export CURL_CA_BUNDLE=/tmp/cacert.pem + sudo ln /opt/homebrew/bin/gfortran-14 /opt/homebrew/bin/gfortran + export PATH="$PATH:/opt/homebrew/Cellar/gcc/14.1.0_2/libexec/gcc/aarch64-apple-darwin23/14/" xmake l ./scripts/test.lua -D -a ${{ matrix.arch }} -k ${{ matrix.kind }} diff --git a/.github/workflows/macos_x86_64.yml b/.github/workflows/macos_x86_64.yml index b04b51e0d22..bb999406812 100644 --- a/.github/workflows/macos_x86_64.yml +++ b/.github/workflows/macos_x86_64.yml @@ -30,4 +30,6 @@ jobs: run: | wget https://curl.haxx.se/ca/cacert.pem -O /tmp/cacert.pem export CURL_CA_BUNDLE=/tmp/cacert.pem + sudo ln /usr/local/bin/gfortran-14 /usr/local/bin/gfortran + export PATH="$PATH:/usr/local/Cellar/gcc/14.1.0_2/libexec/gcc/x86_64-apple-darwin21/14/" xmake l ./scripts/test.lua -D -a ${{ matrix.arch }} -k ${{ matrix.kind }} diff --git a/packages/s/scotch/xmake.lua b/packages/s/scotch/xmake.lua index 957a94cfaf1..a8a1fd782ef 100644 --- a/packages/s/scotch/xmake.lua +++ b/packages/s/scotch/xmake.lua @@ -15,11 +15,12 @@ package("scotch") if is_plat("linux") then add_syslinks("pthread") end - -- add_links("esmumps", "scotch", "scotcherr", "scotcherrexit", "scotchmetis") + add_links("ptesmumps", "esmumps", "scotch", "scotcherr", "scotcherrexit", "scotchmetis", "scotchmetisv5", "scotchmetisv3") on_load(function (package) if package:version():ge("7.0.0") then package:add("deps", "cmake") package:add("deps", "flex", "bison") + package:add("deps", "gfortran", {kind = "binary"}) if package:config("zlib") then package:add("deps", "zlib") end