From 6a68bc39c72e512efdfd075fb7d877446d79b9ec Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Thu, 11 Jul 2019 16:45:54 -0400 Subject: [PATCH 1/3] foamToTecplot360: adjusting the compilation under macOS 10.14.5 (64 bits). The compilation constant MAC64 is necessary for the proper definition of integer types like UInt64_t, UInt32_t, and ArbParam_t --- .../foamToTecplot360/tecio/tecsrc/Make/tecioOptions | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/tecsrc/Make/tecioOptions b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/tecsrc/Make/tecioOptions index b4ca99aef..8f5db43bf 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/tecsrc/Make/tecioOptions +++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/tecsrc/Make/tecioOptions @@ -2,10 +2,14 @@ TECIO_FLAGS = -DMAKEARCHIVE -DLINUX -DLINUX64 -DUSEENUM -DTHREED -U_WIN32 -DENGINE -#elif defined(darwinIntel) || defined(darwinIntel64) || defined(darwinPpc) || defined(darwinPpc64) +#elif defined(darwinIntel) || defined(darwinPpc) TECIO_FLAGS = -DMAKEARCHIVE -DDARWIN -DUSEENUM -DTHREED -U_WIN32 -DENGINE +#elif defined(darwinIntel64) || defined(darwinPpc64) + + TECIO_FLAGS = -DMAKEARCHIVE -DDARWIN -DUSEENUM -DTHREED -U_WIN32 -DENGINE -DMAC64 + #elif defined(linuxIA64) TECIO_FLAGS = -DMAKEARCHIVE -DLINUX -DLINUXI64 -DUSEENUM -DTHREED -U_WIN32 -DENGINE From fd0e75b82247cda60f086b04c34d90d793e35a6f Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Thu, 11 Jul 2019 17:00:12 -0400 Subject: [PATCH 2/3] ThirdParty: libccmio. Usual adjustments when moving to a newer version of macOS/OSX. In this case, macOS 10.14.5 (darwin18) --- ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 | 8 ++++++-- ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 b/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 index 49c212c0c..7a6032342 100644 --- a/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 +++ b/ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 @@ -7,7 +7,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.gnu.to.star libccmio-2.6.1/config/co # $Id: config.gnu.to.star,v 1.4 2006/06/05 21:12:16 geoffp Exp $ -@@ -34,6 +34,14 @@ +@@ -34,6 +34,15 @@ x86_64-unknown-linux-gnu-null) echo linux64_2.4-x86-glibc_2.2.5 ;; ppc64-unknown-linux-gnu-null) echo linux64_2.6-pwr4-glibc_2.3.3 ;; i386-apple-darwin8-null) echo i386-apple-darwin8 ;; @@ -19,6 +19,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.gnu.to.star libccmio-2.6.1/config/co + i386-apple-darwin15-null) echo i386-apple-darwin15 ;; + i386-apple-darwin16-null) echo i386-apple-darwin16 ;; + i386-apple-darwin17-null) echo i386-apple-darwin17 ;; ++ i386-apple-darwin18-null) echo i386-apple-darwin18 ;; *) echo unknown ;; esac @@ -40,7 +41,7 @@ diff -ruN libccmio-2.6.1_orig/config/config.system libccmio-2.6.1/config/config. # $Id: config.system,v 1.2 2005/09/29 22:19:19 geoffp Exp $ -@@ -87,6 +87,33 @@ +@@ -87,6 +87,36 @@ i386-apple-darwin8.11.1) echo i386-apple-darwin8 ;; @@ -70,6 +71,9 @@ diff -ruN libccmio-2.6.1_orig/config/config.system libccmio-2.6.1/config/config. + + i386-apple-darwin17.* ) + echo i386-apple-darwin17 ;; ++ ++ i386-apple-darwin18.* ) ++ echo i386-apple-darwin18 ;; + *) echo unknown diff --git a/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec b/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec index 53806ea6c..59249c4c3 100644 --- a/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec +++ b/ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec @@ -107,6 +107,7 @@ Patch0: libccmio-2.6.1.patch_0 [ ! -d config/i386-apple-darwin15 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin15 [ ! -d config/i386-apple-darwin16 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin16 [ ! -d config/i386-apple-darwin17 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin17 + [ ! -d config/i386-apple-darwin18 ] && cp -r config/i386-apple-darwin8 config/i386-apple-darwin18 %endif # Warning: # 1: The name of the ADF library will be renamed to libadf_ccmio since this From e9bcc973550937a1dea3eb3d3133b12b5c086fd4 Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Thu, 11 Jul 2019 17:05:45 -0400 Subject: [PATCH 3/3] ThirdParty: minor adjustments under macOS 10.14.5 for the compilation of ParMGridGen-1.0 and metis-5.1.0. The environment variable $CC has to be written between double-quotes when using it as a make command-line parameter for CC. --- ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec | 2 +- ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec b/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec index d52fc4073..3d378cac5 100644 --- a/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec +++ b/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec @@ -106,7 +106,7 @@ fi [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 - make -j $WM_NCOMPPROCS CC=$CC + make -j $WM_NCOMPPROCS CC="$WM_CC" %install # Manual installation diff --git a/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec b/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec index f115d27ba..88ee4c8ca 100644 --- a/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec +++ b/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec @@ -109,10 +109,10 @@ fi %ifos darwin make config # The parameter -D_POSIX_C_SOURCE=200809 has a side effect on Mac OS X - make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC" CC=$CC + make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC" CC="$CC" %else make config - make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC -D_POSIX_C_SOURCE=200809" CC=$CC + make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC -D_POSIX_C_SOURCE=200809" CC="$CC" %endif %install