exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update the compilation of the nextRelease branch under macOS. Martin Beaudoin

Browse source
This commit is contained in:
Hrvoje Jasak 2019-07-18 15:02:59 +01:00
commit f44abc5368
5 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ThirdParty/rpmBuild/SOURCES/libccmio-2.6.1.patch_0 vendored
View file

@ -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 $ # $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 ;; 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 ;; ppc64-unknown-linux-gnu-null) echo linux64_2.6-pwr4-glibc_2.3.3 ;;
i386-apple-darwin8-null) echo i386-apple-darwin8 ;; 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-darwin15-null) echo i386-apple-darwin15 ;;
+ i386-apple-darwin16-null) echo i386-apple-darwin16 ;; + i386-apple-darwin16-null) echo i386-apple-darwin16 ;;
+ i386-apple-darwin17-null) echo i386-apple-darwin17 ;; + i386-apple-darwin17-null) echo i386-apple-darwin17 ;;
+ i386-apple-darwin18-null) echo i386-apple-darwin18 ;;
*) echo unknown ;; *) echo unknown ;;
esac 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 $ # $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) i386-apple-darwin8.11.1)
echo i386-apple-darwin8 ;; 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.* ) + i386-apple-darwin17.* )
+ echo i386-apple-darwin17 ;; + echo i386-apple-darwin17 ;;
+
+ i386-apple-darwin18.* )
+ echo i386-apple-darwin18 ;;
+ +
*) *)
echo unknown echo unknown

2
ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec vendored
View file

@ -106,7 +106,7 @@ fi
[ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS"
[ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
make -j $WM_NCOMPPROCS CC=$CC make -j $WM_NCOMPPROCS CC="$WM_CC"
%install %install
# Manual installation # Manual installation

1
ThirdParty/rpmBuild/SPECS/libccmio-2.6.1.spec vendored
View file

@ -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-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-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-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 %endif
# Warning: # Warning:
# 1: The name of the ADF library will be renamed to libadf_ccmio since this # 1: The name of the ADF library will be renamed to libadf_ccmio since this

4
ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec vendored
View file

@ -109,10 +109,10 @@ fi
%ifos darwin %ifos darwin
make config make config
# The parameter -D_POSIX_C_SOURCE=200809 has a side effect on Mac OS X # 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 %else
make config 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 %endif
%install %install

6
applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecio/tecsrc/Make/tecioOptions
View file

@ -2,10 +2,14 @@
TECIO_FLAGS = -DMAKEARCHIVE -DLINUX -DLINUX64 -DUSEENUM -DTHREED -U_WIN32 -DENGINE 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 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) #elif defined(linuxIA64)
TECIO_FLAGS = -DMAKEARCHIVE -DLINUX -DLINUXI64 -DUSEENUM -DTHREED -U_WIN32 -DENGINE TECIO_FLAGS = -DMAKEARCHIVE -DLINUX -DLINUXI64 -DUSEENUM -DTHREED -U_WIN32 -DENGINE