Skip to content

Commit 09752c1

Browse files
author
Damian Rouson
committed
Bump the minimum gfotran version to 5.3.0.
Reduced the installed gfortran version to the gcc 5 branch, effectively matching the script-installed version to the minimum version.
1 parent 10ec821 commit 09752c1

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ find_or_install()
265265
stack_push dependency_path "none" `./build $package --default --query-path` `./build gcc --default --query-path`
266266
else
267267
printf "yes.\n"
268-
printf "$this_script: Checking whether $executable in PATH wraps gfortran version 5.1.0 or later... "
268+
printf "$this_script: Checking whether $executable in PATH wraps gfortran version 5.3.0 or later... "
269269
$executable acceptable_compiler.f90 -o acceptable_compiler
270270
$executable print_true.f90 -o print_true
271271
acceptable=`./acceptable_compiler`
@@ -332,7 +332,7 @@ find_or_install()
332332
stack_push dependency_path "none"
333333

334334
elif [[ "$package_in_path" == "true" ]]; then
335-
printf "$this_script: Checking whether $executable in PATH is version 5.1.0 or later..."
335+
printf "$this_script: Checking whether $executable in PATH is version 5.3.0 or later..."
336336
$executable -o acceptable_compiler acceptable_compiler.f90
337337
$executable -o print_true print_true.f90
338338
is_true=`./print_true`
@@ -712,7 +712,7 @@ print_header()
712712
clear
713713
echo ""
714714
echo "*** A default build of OpenCoarrays requires CMake 3.4.0 or later ***"
715-
echo "*** and MPICH 3.1.4 wrapping GCC Fortran (gfortran) 5.1.0 or later. ***"
715+
echo "*** and MPICH 3.1.4 wrapping GCC Fortran (gfortran) 5.3.0 or later. ***"
716716
echo "*** Additionally, CMake, MPICH, and GCC have their own prerequisites. ***"
717717
echo "*** This script will check for most known requirements in your PATH ***"
718718
echo "*** environment variable and in the default installation directory ***"

install_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.1.0 "
38+
print *,compiler_version() >= "GCC version 5.3.0 "
3939
end program

install_prerequisites/build

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ set_default_version()
7272
# See http://stackoverflow.com/questions/1494178/how-to-define-hash-tables-in-bash
7373
package_version=(
7474
"cmake:3.4.0"
75-
"gcc:trunk"
75+
"gcc:gcc-5-branch"
7676
"mpich:3.1.4"
7777
"wget:1.16.3"
7878
"flex:2.6.0"
@@ -304,12 +304,17 @@ download_if_necessary()
304304
# In this case, args="ls" and the list of available versions has been printed so we can move on.
305305
exit 1
306306
fi
307-
if [ -f $download_path/$url_tail ] || [ -d $download_path/$url_tail ]; then
308-
echo "Download succeeded. $url_tail is in the following location:"
309-
echo "$download_path"
307+
if [[ "$fetch" == "svn" ]]; then
308+
search_path=$download_path/$version_to_build
309+
else
310+
search_path=$download_path/$url_tail
311+
fi
312+
if [ -f $search_path ] || [ -d $search_path ]; then
313+
echo "Download succeeded. The $package_to_build source is in the following location:"
314+
echo "$search_path"
310315
else
311-
echo "Download failed: $url_tail is not in the following, expected location:"
312-
echo "$download_path"
316+
echo "Download failed. The $package_to_build source is not in the following, expected location:"
317+
echo "$search_path"
313318
echo "Aborting. [exit 110]"
314319
exit 110
315320
fi
@@ -320,7 +325,7 @@ download_if_necessary()
320325
unpack_if_necessary()
321326
{
322327
if [[ $fetch == "svn" || $fetch == "git" ]]; then
323-
package_source_directory=$url_tail
328+
package_source_directory=$version_to_build
324329
else
325330
printf "Unpacking $url_tail. \n"
326331
printf "Unpack command: tar xf $url_tail \n"

0 commit comments

Comments
 (0)