download-all.sh/patched-trunk-install.sh on macOS

Both work on macOS without glitch with either curl or wget present

Author: Damian Rouson

developer-scripts/patched-trunk-install.sh

@@ -142,14 +142,33 @@ fi
 
 # Ensure that the just-installed GCC libraries are used when linking
 echo "Setting and exporting LD_LIBRARY_PATH"
-if [[ -d "${PWD}/prerequisites/installations/gcc/trunk/lib64" ]]; then 
+
+function prepend_to_LD_LIBRARY_PATH() {
+  : ${1?'set_LD_LIBRARY_PATH: missing path'}
+  new_path="${1}"
   if [[ -z "${LD_LIBRARY_PATH:-}" ]]; then 
-    export LD_LIBRARY_PATH="${patched_GCC_install_path}/lib64/"
+    export LD_LIBRARY_PATH="${new_path}"
   else
-    export LD_LIBRARY_PATH="${patched_GCC_install_path}/lib64/:${LD_LIBRARY_PATH}"
+    export LD_LIBRARY_PATH="${new_path}:${LD_LIBRARY_PATH}"
   fi
+}
+
+old_path="${LD_LIBRARY_PATH:-}"
+
+if [[ -d "${PWD}/prerequisites/installations/gcc/trunk/lib"   ]]; then 
+  prepend_to_LD_LIBRARY_PATH "${patched_GCC_install_path}/lib/"
+fi
+
+if [[ -d "${PWD}/prerequisites/installations/gcc/trunk/lib64" ]]; then 
+  prepend_to_LD_LIBRARY_PATH "${patched_GCC_install_path}/lib64/"
+fi
+
+echo "\${LD_LIBRARY_PATH}=${LD_LIBRARY_PATH:=}"
+
+if [[ "${LD_LIBRARY_PATH}" == "${old_path}" ]]; then
+  echo "gfortran libraries did not install where expected: ${patched_GCC_install_path}/lib64 or ${patched_GCC_install_path}/lib"
+  exit 1
 fi
-echo "\${LD_LIBRARY_PATH}=${LD_LIBRARY_PATH:-}"
 
 # Build MPICH with the patched compilers.
 echo "Building MPICH with the patched compilers."
@@ -160,7 +179,7 @@ echo "Building MPICH with the patched compilers."
 
 # Verify that MPICH installed where expected
 mpich_install_path=$(./install.sh -P mpich)
-if type ! "${mpich_install_path}"/bin/mpif90; then
+if ! type "${mpich_install_path}"/bin/mpif90; then
   echo "MPICH is not installed in the expected location ${mpich_install_path}." 
   exit 1
 fi
@@ -171,5 +190,5 @@ echo "Building OpenCoarrays with the patched compilers"
 ./install.sh --yes-to-all \
   --with-fortran "${patched_GCC_install_path}/bin/gfortran" \
   --with-c "${patched_GCC_install_path}/bin/gcc" \
-  --with-C "${patched_GCC_install_path}/bin/g++" 
+  --with-C "${patched_GCC_install_path}/bin/g++" \
   --with-mpi "${mpich_install_path}"

prerequisites/download-all.sh

@@ -72,11 +72,9 @@ info "__os: ${__os}"
 info "__usage: ${__usage}"
 info "LOG_LEVEL: ${LOG_LEVEL}"
 
-info "-b (--install-branch):   ${arg_b} "
 info "-d (--debug):            ${arg_d} "
 info "-e (--verbose):          ${arg_e} "
 info "-h (--help):             ${arg_h} "
-info "-l (--list-branches):    ${arg_l} "
 }
 
 download_list=( "m4" "bison" "flex" "mpich" "cmake" )
@@ -89,7 +87,7 @@ for package_to_download in "${download_list[@]}" ; do
   fi
 done
 
-if [[ ! -z ${install_branch:-}  ]]; then
+if [[ ! -z ${arg_b:-}  ]]; then
   ./install.sh --package gcc  --only-download --install-branch "${arg_b}"
 else  # Download default version
   ./install.sh --package gcc  --only-download

prerequisites/download-all.sh-usage

@@ -1,23 +1,23 @@
-  -b --install-branch [arg]   Checkout the specified branch.
   -d --debug                  Enable debug mode.
   -e --verbose                Enable verbose mode, print script as it is executed.
   -h --help                   Print this page.
-  -l --list-packages          List the packages this script will download.
-  -y --yes-to-all             (not used )
-  -B --list-branches [arg]    (not used )
-  -c --with-c [arg]           (not used )
-  -C --with-cxx [arg]         (not used )
-  -D --print-downloader [arg] (not used )
-  -f --with-fortran [arg]     (not used )
-  -i --install-prefix [arg]   (not used )
-  -I --install-version [arg]  (not used )
-  -j --num-threads [arg]      (not used )
-  -m --with-cmake [arg]       (not used )
-  -M --with-mpi [arg]         (not used )
-  -n --no-color               (not used )
-  -o --only-download          (not used )
-  -p --package [arg]          (not used )
-  -P --print-path [arg]       (not used )
-  -U --print-url [arg]        (not used )
-  -v --version                (not used )
-  -V --print-version [arg]    (not used )
+  -l --list-branches          (not used)
+  -b --install-branch [arg]   (not used)
+  -y --yes-to-all             (not used)
+  -B --list-branches [arg]    (not used)
+  -c --with-c [arg]           (not used)
+  -C --with-cxx [arg]         (not used)
+  -D --print-downloader [arg] (not used)
+  -f --with-fortran [arg]     (not used)
+  -i --install-prefix [arg]   (not used)
+  -I --install-version [arg]  (not used)
+  -j --num-threads [arg]      (not used)
+  -m --with-cmake [arg]       (not used)
+  -M --with-mpi [arg]         (not used)
+  -n --no-color               (not used)
+  -o --only-download          (not used)
+  -p --package [arg]          (not used)
+  -P --print-path [arg]       (not used)
+  -U --print-url [arg]        (not used)
+  -v --version                (not used)
+  -V --print-version [arg]    (not used)