Changeset 25639

Timestamp:

10/06/20 14:42:42 (4 years ago)

Author:

jdquinn

Message:

CHG: Attempt to fix lack of fmemopen on macOS < 10.13

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (3 diffs)
• src/c/Makefile.am (modified) (1 diff)
• src/c/modules/QmuStatisticsx/QmuStatisticsx.cpp (modified) (1 diff)
• src/c/modules/QmuStatisticsx/QmuStatisticsx.h (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -192 +192 @@
 
         AC_MSG_CHECKING([if this is a Mac build])
+        MAC_FMEMOPEN=0
         case "${host_os}" in
                 *darwin*)
                         IS_MAC=yes
+                        if [[ $(system_profiler SPSoftwareDataType | $(which grep) "System Version:" | sed -e "s/[[:space:]]*System Version: macOS //" | cut -d "." -f 2) -ge 13 ]]; then
+                                MAC_FMEMOPEN=yes
+                        else
+                                MAC_FMEMOPEN=no
+                        fi
                 ;;
                 *)
@@ -201 +207 @@
         esac
         AM_CONDITIONAL([MAC], [test "${IS_MAC}" == "yes"])
+        AM_CONDITIONAL([MAC_FMEMOPEN], [test "${MAC_FMEMOPEN}" == "yes"])
         AC_MSG_RESULT([${IS_MAC}])
 
@@ -2332 +2339 @@
 
                 AC_MSG_CHECKING(for Gmsh version)
-                GMSH_VERSION_MAJOR=`${GMSH_ROOT}/bin/gmsh -info | grep "Version" | sed -e "s/Version@<:@@<:@:blank:@:>@@:>@*:@<:@@<:@:blank:@:>@@:>@//" | cut -d "." -f1`
+                GMSH_VERSION_MAJOR=`${GMSH_ROOT}/bin/gmsh -info | grep "Version" | sed -e "s/Version@<:@@<:@:blank:@:>@@:>@*:@<:@@<:@:blank:@:>@@:>@//" | cut -d "." -f 1`
                 AC_MSG_RESULT([${GMSH_VERSION_MAJOR}])
                 AC_DEFINE_UNQUOTED(_GMSH_VERSION_MAJOR_, $GMSH_VERSION_MAJOR, [Gmsh major version])

issm/trunk-jpl/src/c/Makefile.am

@@ -21 +21 @@
 
 #Core sources
+issm_sources =
+
+#GLIBC sources {{{
+if MAC
+if !MAC_FMEMOPEN
+issm_sources += \
+        ./ext/fmemopen/fmemopen.c
+endif
+endif
+#}}}
+
 #BAMG sources  {{{
-issm_sources =
 if BAMG
 issm_sources += \

issm/trunk-jpl/src/c/modules/QmuStatisticsx/QmuStatisticsx.cpp

@@ -174 +174 @@
                 /*figure out size of file, and read the whole thing:*/
                 _printf0_("    reading file:\n");
-                fseek (fid, 0, SEEK_END);
+                fseek(fid, 0, SEEK_END);
                 length = ftell (fid);
-                fseek (fid, 0, SEEK_SET);
+                fseek(fid, 0, SEEK_SET);
                 buffer = xNew<char>(length);
-                fread (buffer, sizeof(char), length, fid);
+                fread(buffer, sizeof(char), length, fid);
 
                 /*close file:*/
-                fclose (fid);
+                fclose(fid);
 
                 /*create a memory stream with this buffer:*/

issm/trunk-jpl/src/c/modules/QmuStatisticsx/QmuStatisticsx.h

@@ -6 +6 @@
 
 #include "../../classes/classes.h"
+
+#if MAC && !MAC_FMEMOPEN
+#include "../../ext/fmemopen/fmemopen.h"
+#endif
 
 int ComputeMeanVariance(Parameters* parameters,Results* results,int color, ISSM_MPI_Comm statcomm);