Skip to content

Commit 6fa3053

Browse files
author
Damian Rouson
committed
Update default GCC version to 6.1.0
In the absence of any arguments that override the corresponding default behavior, ./install.sh now builds GCC 6.1.0 if no GCC installation with that version number or greater is in the PATH or in prerequisites/installations. This commit also adjusts related documentation, screen output, and compiler acceptability checks.
1 parent c4a866a commit 6fa3053

File tree

10 files changed

+16
-18
lines changed

10 files changed

+16
-18
lines changed

INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ The prerequisites below and their dependencies are recommended for the broadest
117117
opencoarrays
118118
├── cmake-3.4.0
119119
└── mpich-3.1.4
120-
└── gcc-5.3.0
120+
└── gcc-6.1.0
121121
├── flex-2.6.0
122122
│   └── bison-3.0.4
123123
│   └── m4-1.4.17

doc/dependency_tree/opencoarrays-tree.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
opencoarrays
22
├── cmake-3.4.0
33
└── mpich-3.1.4
4-
└── gcc-5.3.0
4+
└── gcc-6.1.0
55
├── flex-2.6.0
66
│   └── bison-3.0.4
77
│   └── m4-1.4.17

doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-5.1.0/flex-2.6.0/bison-3.0.4/m4-1.4.17/.gitkeep

Whitespace-only changes.

doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-5.1.0/gmp/.gitkeep

Whitespace-only changes.

doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-5.1.0/mpc/.gitkeep

Whitespace-only changes.

doc/dependency_tree/opencoarrays/mpich-3.1.4/gcc-5.1.0/mpfr/.gitkeep

Whitespace-only changes.

prerequisites/acceptable_compiler.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@
3535
program main
3636
use iso_fortran_env, only : compiler_version
3737
implicit none
38-
print *,compiler_version() >= "GCC version 5.3.0 "
38+
print *,compiler_version() >= "GCC version 6.1.0 "
3939
end program

prerequisites/build-functions/set_or_print_default_version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set_or_print_default_version()
1818
# See http://stackoverflow.com/questions/1494178/how-to-define-hash-tables-in-bash
1919
package_version=(
2020
"cmake:3.4.0"
21-
"gcc:5.3.0"
21+
"gcc:6.1.0"
2222
"mpich:3.1.4"
2323
"wget:1.16.3"
2424
"flex:2.6.0"

prerequisites/install-functions/find_or_install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ find_or_install()
134134
stack_push dependency_path "none" "$(./build.sh -P "$package")" "$(./build.sh -P gcc)"
135135
else
136136
printf "yes.\n"
137-
echo -e "$this_script: Checking whether $executable in PATH wraps gfortran version 5.3.0 or later... "
137+
echo -e "$this_script: Checking whether $executable in PATH wraps gfortran version `./build.sh -V gcc` or later... "
138138
$executable acceptable_compiler.f90 -o acceptable_compiler
139139
$executable print_true.f90 -o print_true
140140
acceptable=$(./acceptable_compiler)
@@ -203,7 +203,7 @@ find_or_install()
203203
stack_push dependency_path "none"
204204

205205
elif [[ "$package_in_path" == "true" ]]; then
206-
echo -e "$this_script: Checking whether $executable in PATH is version 5.3.0 or later..."
206+
echo -e "$this_script: Checking whether $executable in PATH is version `./build.sh -V gcc` or later..."
207207
$executable -o acceptable_compiler acceptable_compiler.f90
208208
$executable -o print_true print_true.f90
209209
is_true=$(./print_true)

prerequisites/install-functions/print_header.sh

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ print_header()
33
{
44
clear
55
echo ""
6-
echo "*** A default build of OpenCoarrays requires CMake 3.4.0 or later ***"
7-
echo "*** and MPICH 3.1.4 wrapping GCC Fortran (gfortran) 5.3.0 or later. ***"
8-
echo "*** Additionally, CMake, MPICH, and GCC have their own prerequisites. ***"
9-
echo "*** This script will check for most known requirements in your PATH ***"
10-
echo "*** environment variable and in the default installation directory ***"
11-
echo "*** to which this script installs each missing prerequisite. The ***"
12-
echo "*** script will recursively traverse the following dependency tree ***"
13-
echo "*** and ask permission to download, build, and install any missing ***"
14-
echo "*** prerequisites: ***"
6+
echo "*** By default, building OpenCoarrays requires CMake 3.4.0 or later, ***"
7+
echo "*** MPICH 3.1.4, and GCC Fortran (gfortran) 6.1.0 or later. To see ***"
8+
echo "*** options for forcing the use of older or alternative packages, execute ***"
9+
echo "*** this script with the -h flag. This script will recursively traverse ***"
10+
echo "*** the following dependency tree, asking permission to download, build, ***"
11+
echo "*** and install any packages that are required for building another ***"
12+
echo "*** package and are neither in your PATH nor in ***"
13+
echo "*** opencoarrays/prerequisites/installations: ***"
1514
echo ""
1615
# Move to a directory tree whose structure mirrors the dependency tree
1716
pushd "$opencoarrays_src_dir/doc/dependency_tree/" > /dev/null
@@ -24,9 +23,8 @@ print_header()
2423
fi
2524
popd > /dev/null
2625
echo ""
27-
printf "*** OpenCoarrays and all prerequisites will be downloaded, built, and installed in ***\n"
28-
echo -e "${build_path}\n"
29-
echo -e "${install_path}\n"
26+
printf "${arg_p} will be installed in ${install_path}\n"
27+
echo ""
3028
printf "Ready to rock and roll? (Y/n)"
3129
read -r install_now
3230
echo -e " $install_now\n"

0 commit comments

Comments
 (0)