Skip to content

Commit 90b944a

Browse files
committed
feat(gcc): instead of mingw → which has the fortran compiler gfortran.
1 parent 53dee04 commit 90b944a

6 files changed

Lines changed: 17 additions & 11 deletions

installer.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ if [ -z "$answer_lowercase" ] || [ "$answer_lowercase" = "y" ] || [ "$answer_low
115115
# INSTALL DEPENDENCIES
116116
# --------------------
117117
if [ -n "$AUR_CMD" ]; then
118-
"$AUR_CMD" "python" "python-pynvim" "fd" "git-delta" "grcov" "rustup" "yarn" "python-pytest" "mingw-w64-gcc" "dotnet-runtime" "dotnet-sdk" "aspnet-runtime" "mono" "jdk-openjdk" "kotlin" "elixir" "npm" "nodejs" "typescript" "make" "go" "nasm" "r" "nuitka" "python" "ruby" "perl" "lua" "pyinstaller" "swift-bin" "flutter-bin" "doxygen" "ldoc" "ruby-yard"; yarn global add "jest" "jsdoc" "typedoc"; cargo install "cargo-nextest"; go install "golang.org/x/tools/cmd/godoc@latest"
118+
"$AUR_CMD" "python" "python-pynvim" "fd" "git-delta" "grcov" "rustup" "yarn" "python-pytest" "gcc" "binutils" "dotnet-runtime" "dotnet-sdk" "aspnet-runtime" "mono" "jdk-openjdk" "kotlin" "elixir" "npm" "nodejs" "typescript" "make" "go" "nasm" "r" "nuitka" "python" "ruby" "perl" "lua" "pyinstaller" "swift-bin" "flutter-bin" "doxygen" "ldoc" "ruby-yard"; yarn global add "jest" "jsdoc" "typedoc"; cargo install "cargo-nextest"; go install "golang.org/x/tools/cmd/godoc@latest"
119119
else
120120
echo "ERROR: You must have 'paru' or 'yay' installed so we can use the AUR."
121121
fi
@@ -127,7 +127,7 @@ if [ -z "$answer_lowercase" ] || [ "$answer_lowercase" = "y" ] || [ "$answer_low
127127
#############################################################################
128128
elif [ "$IS_UBUNTU" = "true" ]; then
129129
echo "Ubuntu detected."
130-
sudo apt update; sudo apt install --install-if-missing "yarn" "ranger" "rust-fd-find" "python-pynvim" "python-pytest" "delta" "rust-grcov" "rustup" "mingw-w64" "dotnet8" "monodevelop" "java-common" "nasm" "r-base" "rustc" "golang" "python" "ruby" "perl" "lua5.3" "kotlin" "elixir" "make" "nodejs" "npm" "node-typescript" "nuitka" "doxygen" "yard"; pip install "pyinstaller"; yarn global add "jest" "jsdoc" "typedoc"; go install "golang.org/x/tools/cmd/godoc@latest"; sudo snap install --classic "flutter"
130+
sudo apt update; sudo apt install --install-if-missing "yarn" "ranger" "rust-fd-find" "python-pynvim" "python-pytest" "delta" "rust-grcov" "rustup" "gcc-defaults" "binutils" "dotnet8" "monodevelop" "java-common" "nasm" "r-base" "rustc" "golang" "python" "ruby" "perl" "lua5.3" "kotlin" "elixir" "make" "nodejs" "npm" "node-typescript" "nuitka" "doxygen" "yard"; pip install "pyinstaller"; yarn global add "jest" "jsdoc" "typedoc"; go install "golang.org/x/tools/cmd/godoc@latest"; sudo snap install --classic "flutter"
131131

132132

133133

@@ -136,7 +136,7 @@ if [ -z "$answer_lowercase" ] || [ "$answer_lowercase" = "y" ] || [ "$answer_low
136136
#############################################################################
137137
elif [ "$IS_MACOS" = "true" ]; then
138138
echo "MacOS detected."
139-
sudo brew install "ranger" "fd" "git-delta" "rustup-init" "yarn" "mingw-w64" "dotnet" "mono" "openjdk" "dart-sdk" "kotlin" "elixir" "node" "typescript" "make" "rust" "go" "nasm" "r" "ruby" "perl" "lua" "swift" "pyinstaller" "doxygen"; sudo brew install --cask "dotnet-sdk" "flutter"; pip install "pynvim" "pytest" "Nuitka"; yarn add global "jest" "jsdoc" "typedoc"; cargo install "cargo-nextest" "grcov"; go install "golang.org/x/tools/cmd/godoc@latest"
139+
sudo brew install "ranger" "fd" "git-delta" "rustup-init" "yarn" "gcc" "binutils" "dotnet" "mono" "openjdk" "dart-sdk" "kotlin" "elixir" "node" "typescript" "make" "rust" "go" "nasm" "r" "ruby" "perl" "lua" "swift" "pyinstaller" "doxygen"; sudo brew install --cask "dotnet-sdk" "flutter"; pip install "pynvim" "pytest" "Nuitka"; yarn add global "jest" "jsdoc" "typedoc"; cargo install "cargo-nextest" "grcov"; go install "golang.org/x/tools/cmd/godoc@latest"
140140

141141

142142

@@ -145,7 +145,7 @@ if [ -z "$answer_lowercase" ] || [ "$answer_lowercase" = "y" ] || [ "$answer_low
145145
#############################################################################
146146
elif [ "$IS_TERMUX" = "true" ]; then
147147
echo "Termux detected."
148-
pkg update; pkg install "tur-repo"; pkg install "ranger" "python" "fd" "git-delta" "yarn" "mono" "openjdk-17" "dart" "kotlin" "elixir" "nodejs" "make" "rust" "golang" "nasm" "python" "ruby" "perl" "liblua52" "swift" "binutils-libs" "gcc-default" "doxygen"; pip install "pynvim" "pytest" "Nuitka" "pyinstaller"; yarn add global "jest" "typescript" "jsdoc" "typedoc"; cargo install "cargo-nextest" "git-delta" "grcov"; go install "golang.org/x/tools/cmd/godoc@latest"
148+
pkg update; pkg install "tur-repo"; pkg install "ranger" "python" "fd" "git-delta" "yarn" "mono" "openjdk-17" "dart" "kotlin" "elixir" "nodejs" "make" "rust" "golang" "nasm" "python" "ruby" "perl" "liblua52" "swift" "gcc-default" "binutils-libs" "doxygen"; pip install "pynvim" "pytest" "Nuitka" "pyinstaller"; yarn add global "jest" "typescript" "jsdoc" "typedoc"; cargo install "cargo-nextest" "git-delta" "grcov"; go install "golang.org/x/tools/cmd/godoc@latest"
149149

150150

151151

@@ -154,7 +154,7 @@ if [ -z "$answer_lowercase" ] || [ "$answer_lowercase" = "y" ] || [ "$answer_low
154154
#############################################################################
155155
elif [ "$IS_FEDORA" = "true" ]; then
156156
echo "Fedora detected."
157-
sudo dnf install "rust-fd-find" "rust-git-delta" "rustup" "python3-pytest" "mingw64-gcc" "binutils" "dotnet6.0" "dotnet-runtime-6.0" "dotnet-sdk-6.0" "aspnetcore-runtime-6.0" "mono-complete" "java-21-openjdk" "elixir" "nodejs" "npm" "typescript" "make" "golang" "nasm" "R-rlang" "ruby" "perl" "lua" "swift-lang" "doxygen" "lua-ldoc" "rubygem-yard"; pip install "pynvim" "pytest" "Nuitka" "pyinstaller"; npm install -g "yarn" "jest" "typescript" "jsdoc" "typedoc"; cargo install "cargo-nextest" "grcov"; go install "golang.org/x/tools/cmd/godoc@latest"
157+
sudo dnf install "rust-fd-find" "rust-git-delta" "rustup" "python3-pytest" "gcc" "binutils" "gcc-gfortran" "dotnet6.0" "dotnet-runtime-6.0" "dotnet-sdk-6.0" "aspnetcore-runtime-6.0" "mono-complete" "java-21-openjdk" "elixir" "nodejs" "npm" "typescript" "make" "golang" "nasm" "R-rlang" "ruby" "perl" "lua" "swift-lang" "doxygen" "lua-ldoc" "rubygem-yard"; pip install "pynvim" "pytest" "Nuitka" "pyinstaller"; npm install -g "yarn" "jest" "typescript" "jsdoc" "typedoc"; cargo install "cargo-nextest" "grcov"; go install "golang.org/x/tools/cmd/godoc@latest"
158158

159159

160160

tests/test-arch-dependencies.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ echo "--------------------------"
5151
# pacman
5252
echo "- Pacman packages -"
5353
dependencies=(
54-
"mingw-w64-gcc" # includes mingw-w64-bintools whish has 'ld'
54+
"gcc"
55+
"binutils" # contains ld (as we don't use mingw)
5556
"dotnet-runtime"
5657
"dotnet-sdk"
5758
"aspnet-runtime"
@@ -80,6 +81,7 @@ dependencies=(
8081
"nuitka"
8182
"swift-language"
8283
"flutter-bin"
84+
"fortran-fpm-bin"
8385
)
8486
check_aur_dependencies "${dependencies[@]}" || exit 1
8587
printf '\n\n\n\n'

tests/test-fedora-dependencies.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ echo "--------------------------"
5656
# fedora
5757
echo "- Fedora packages -"
5858
dependencies=(
59-
"mingw-gcc/mingw64-gcc"
59+
"gcc/gcc"
6060
"binutils/binutils" # includes ld
6161
"dotnet6.0/dotnet"
6262
"dotnet6.0/dotnet-runtime-6.0"
@@ -76,6 +76,7 @@ dependencies=(
7676
"perl/perl"
7777
"lua/lua"
7878
"swift-lang/swift-lang"
79+
"gcc/gcc-gfortran"
7980
)
8081
check_fedora_dependencies "${dependencies[@]}" || exit 1
8182

tests/test-macos-dependencies.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@ echo "--------------------------"
5656
# homebrew
5757
echo "- Homebrew packages -"
5858
dependencies=(
59-
"mingw-w64" # Warning: It might not include 'ld'.
60-
"dotnet" # runtime
59+
"gcc" # has gfortran
60+
"binutils" # contains ld (as we don't use mingw)
61+
"dotnet" # runtime
6162
"mono"
6263
"openjdk"
6364
"dart-sdk"
@@ -82,6 +83,7 @@ check_homebrew_dependencies "${dependencies[@]}" || exit 1
8283
dependencies=(
8384
"dotnet-sdk"
8485
"flutter"
86+
"simply-fortran"
8587
)
8688
check_homebrew_cask_dependencies "${dependencies[@]}" || exit 1
8789

tests/test-termux-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ check_termux_dependencies "${dependencies[@]}" || exit 1
7979

8080
echo "- Termux packages (TUR) -"
8181
dependencies=(
82-
"gcc-default" # instead of mingw (we don't need to target multiple OS)
82+
"gcc-default" # Has gfortran
8383
)
8484
check_tur_dependencies "${dependencies[@]}" || exit 1
8585

tests/test-ubuntu-dependencies.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ echo "--------------------------"
4646
# ubuntu
4747
echo "- Ubuntu packages -"
4848
dependencies=(
49-
"mingw-w64"
49+
"gcc-defaults" # has gfortran
50+
"binutils" # contains ld (as we don't use mingw)
5051
"dotnet8"
5152
"monodevelop"
5253
"java-common" # default-jdk

0 commit comments

Comments
 (0)