update installer to work on macOS Catalina

Author: Damian Rouson

prerequisites/build-functions/build_and_install.sh

@@ -79,25 +79,30 @@ build_and_install()
     # Warn about header prerequisite on macOS Mojave or subsequent versions
     if [[ $(uname) == "Darwin" ]]; then
       export kernel=$(uname -r)
-      export Mojave="18.7.0"
+      export Mojave="18.0.0"
+      export Catalina="19.0.0"
       if [ $(version $kernel) -ge $(version $Mojave) ]; then
-        info ""
-        info "______________________________________________________________________________"
-        info "Detected Darwin $kernel >= $Mojave (Mojave).  If $package_to_build build fails"
-        info "due to a missing header (*.h) file, please try something like the following bash command:"
-        info "open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg"
-        info "Follow the prompts to install the missing headers. Then restart this $this_script."
-        info "See https://bit.ly/build-gcc-on-mojave for more details."
-        if [[ "${arg_y}" == "${__flag_present}" ]]; then
-          info "-y or --yes-to-all flag present. Proceeding with non-interactive build."
+        if [ $(version $kernel) -ge $(version $Catalina) ]; then
+          export with_sysroot="--with-sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
         else
-          info "Would you like to proceed anyway? (Y/n)"
-          read -r proceed
-          if [[ "${proceed}" == "n" || "${proceed}" == "N" || "${proceed}" == "no"  ]]; then
-            info "n"
-            emergency "Aborting. [exit 80]"
+          info ""
+          info "______________________________________________________________________________"
+          info "Detected Darwin $kernel (Mojave).  If $package_to_build build fails due to a"
+          info "missing header (*.h) file, please try something like the following bash command:"
+          info "open /Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg"
+          info "Follow the prompts to install the missing headers. Then restart this $this_script."
+          info "See https://bit.ly/build-gcc-on-mojave for more details."
+          if [[ "${arg_y}" == "${__flag_present}" ]]; then
+            info "-y or --yes-to-all flag present. Proceeding with non-interactive build."
           else
-            info "y"
+            info "Would you like to proceed anyway? (Y/n)"
+            read -r proceed
+            if [[ "${proceed}" == "n" || "${proceed}" == "N" || "${proceed}" == "no"  ]]; then
+              info "n"
+              emergency "Aborting. [exit 80]"
+            else
+              info "y"
+            fi
           fi
         fi
       fi
@@ -127,8 +132,8 @@ build_and_install()
     info "popd"
     popd || emergency "build_and_install.sh: popd failed"
     info "Configuring gcc/g++/gfortran builds with the following command:"
-    info "${download_path}/${package_source_directory}/configure --prefix=${install_path} --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror ${bootstrap_configure}"
-    "${download_path}/${package_source_directory}/configure" --prefix="${install_path}" --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror "${bootstrap_configure}"
+    info "${download_path}/${package_source_directory}/configure --prefix=${install_path} --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror ${bootstrap_configure} ${with_sysroot:-}"
+    "${download_path}/${package_source_directory}/configure" --prefix="${install_path}" --enable-languages=c,c++,fortran,lto --disable-multilib --disable-werror "${bootstrap_configure}" "${with_sysroot:-}"
     info "Building with the following command: make -j ${num_threads} ${bootstrap_build}"
     make -j ${num_threads} ${bootstrap_build:-}
     if [[ -n "${SUDO:-}" ]]; then

prerequisites/build-functions/download_if_necessary.sh

@@ -58,7 +58,7 @@ download_if_necessary()
       ;;
    esac
 
-  if  [[ -f "${download_path}/${url_tail}" || -d "${download_path}/${url_tail##*branches/}" && ! -z ${url_tail##*branches/} ]]; then
+  if  [[ -f "${download_path}/${url_tail}" || -d "${download_path}/${url_tail}" ]]; then
     info "Found '${url_tail##*branches/}' in ${download_path}."
     info "If it resulted from an incomplete download, building ${package_name} could fail."
     if [[ "${arg_y}" == "${__flag_present}" ]]; then

prerequisites/build-functions/set_or_print_default_version.sh

@@ -20,6 +20,10 @@ set_or_print_default_version()
     exit 0
   fi
 
+  if [[ $(uname) == "Darwin" ]]; then
+    apple_flex_version="2.5.35"
+  fi
+
   [ "${package_name}" == "opencoarrays" ] &&
     emergency "Please use this script with a previously downloaded opencoarrays source archive. This script does not download opencoarrays "
   # This is a bash 3 hack standing in for a bash 4 hash (bash 3 is the lowest common
@@ -30,7 +34,7 @@ set_or_print_default_version()
     "gcc:10.1.0"
     "mpich:3.2"
     "wget:1.16.3"
-    "flex:2.6.0"
+    "flex:${apple_flex_version:-2.6.0}"
     "bison:3.0.4"
     "pkg-config:0.28"
     "make:4.1"

prerequisites/build-functions/set_or_print_url.sh

@@ -46,7 +46,7 @@ else
 
   # Set differing tails for GCC release downloads versus development branch checkouts
   package_url_tail=(
-    "gcc;gcc.git"
+    "gcc;gcc"
     "wget;wget-${version_to_build-}.tar.gz"
     "m4;m4-${version_to_build-}.tar.bz2"
     "pkg-config;pkg-config-${version_to_build-}.tar.gz"

prerequisites/check_version.sh

@@ -5,8 +5,8 @@
 # -- Verify whether an OpenCoarrays prerequisite meets the required minimum version number.
 #
 # OpenCoarrays is distributed under the OSI-approved BSD 3-clause License:
-# Copyright (c) 2015-2016, Sourcery, Inc.
-# Copyright (c) 2015-2016, Sourcery Institute
+# Copyright (c) 2015-2020, Sourcery, Inc.
+# Copyright (c) 2015-2020, Sourcery Institute
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -44,7 +44,7 @@ this_script=$(basename "$0")
 usage()
 {
     echo ""
-    echo " $this_script - Bash script for verifyin minimum version numbers for OpenCoarrays prerequisites"
+    echo " $this_script - Bash script for verifying minimum version numbers for OpenCoarrays prerequisites"
     echo ""
     echo " Usage (optional arguments in square brackets): "
     echo "      $this_script [<option>]"
@@ -104,21 +104,28 @@ if [[ "$verbose" == "--verbose" ]]; then
   echo "$package_version_header"
 fi
 
-# Extract the text after the final space:
-version=${package_version_header##* }
-major=${version%%.*}
-minor_patch=${version#*.}
-minor=${minor_patch%%.*}
-patch=${version##*.}
+before_first_dot="${package_version_header%%.*}"
+major="${before_first_dot##* }" # grab text after final space in remaining string
+
+after_first_dot="${package_version_header#*.}"
+minor="${after_first_dot%%.*}"
+
+after_final_dot="${package_version_header##*.}" # grab text after final dot
+if [[ "$after_final_dot" == "$after_first_dot" ]]; then
+  patch=""
+else
+  patch="${after_final_dot%% *}"
+fi
+
 if [[ "$verbose" == "--verbose" ]]; then
-  echo "$version = $major . $minor . $patch"
+  echo "$major . $minor . $patch"
 fi
 
-# Extract the text after the final space:
 min_major=${minimum_version%%.*}
 min_minor_patch=${minimum_version#*.}
 min_minor=${min_minor_patch%%.*}
 min_patch=${minimum_version##*.}
+
 if [[ "$verbose" == "--verbose" ]]; then
   echo "$minimum_version = $min_major . $min_minor . $min_patch"
 fi