Changeset 27397 for issm/trunk-jpl/externalpackages/gmsh/install-4-mac-static.sh

Timestamp:

11/19/22 15:08:12 (2 years ago)

Author:

jdquinn

Message:

CHG: Updates to way we discover libgfortran in ext pkg install scripts; file name; compact unbind warning suppression.

File:

• issm/trunk-jpl/externalpackages/gmsh/install-4-mac-static.sh (modified) (2 diffs)

issm/trunk-jpl/externalpackages/gmsh/install-4-mac-static.sh

@@ -22 +22 @@
 # Find libgfortran and libgcc so we do not have to hardcode them
 #
-# Should retrieve a copy of gfortran that is compiled from source before returning one that is installed via package manager
-#
 # TODO:
 # - Move this to etc/environment.sh
@@ -29 +27 @@
 # - Otherwise, refactor this to work with other gfortran installations.
 #
-LIBGFORTRAN=$(mdfind -onlyin /usr -name libgfortran | egrep -n libgfortran.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
+LIBGFORTRAN=$(find /usr -name libgfortran* 2>/dev/null | egrep -n libgfortran.a | sed "s/[0-9]*://g" | head -1)
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
-LIBGCC=$(mdfind -onlyin ${LIBGFORTRAN_ROOT} -name libgcc | egrep -n libgcc.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
+LIBGCC=$(find ${LIBGFORTRAN_ROOT} -name libgcc* 2>/dev/null | egrep -n libgcc.a | sed "s/[0-9]*://g" | head -1)
 
 # Cleanup