Update

1. 2.4.x patch: problem with includes during foamy*Mesh build. 2. 4.x patch: new commits
mrklein · Jul 30, 2016 · ed1332b · ed1332b
1 parent 5880d99
commit ed1332b
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 32 deletions.
diff --git a/OpenFOAM-2.4.x-2b147f4.patch b/OpenFOAM-2.4.x-2b147f4.patch
@@ -3,7 +3,7 @@
  applications/Allwmake                              |  12 +-
  .../mesh/conversion/kivaToFoam/readKivaGrid.H      |   2 +-
  .../mesh/generation/foamyHexMesh/Make/options      |   4 +
- .../foamyHexMesh/conformalVoronoiMesh/Make/options |   4 +
+ .../foamyHexMesh/conformalVoronoiMesh/Make/options |   7 +-
  .../backgroundMeshDecompositionTemplates.C         |   4 +-
  .../CGALTriangulation3DKernel.H                    |   8 ++
  .../conformalVoronoiMesh/conformalVoronoiMesh.C    |   2 +-
@@ -92,15 +92,15 @@
  .../specie/reaction/Reactions/Reaction/Reaction.C  |   6 +-
  wmake/Makefile                                     |   4 +
  wmake/rules/darwin64Clang/c                        |  16 +++
- wmake/rules/darwin64Clang/c++                      |  23 ++++
+ wmake/rules/darwin64Clang/c++                      |  26 +++++
  wmake/rules/darwin64Clang/c++Debug                 |   2 +
  wmake/rules/darwin64Clang/c++Opt                   |   3 +
  wmake/rules/darwin64Clang/c++Prof                  |   2 +
  wmake/rules/darwin64Clang/cDebug                   |   2 +
  wmake/rules/darwin64Clang/cOpt                     |   2 +
  wmake/rules/darwin64Clang/cProf                    |   2 +
  wmake/rules/darwin64Clang/general                  |  10 ++
- 102 files changed, 964 insertions(+), 186 deletions(-)
+ 102 files changed, 968 insertions(+), 188 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
 index ec46862..ead2d97 100644
@@ -206,7 +206,7 @@ index 2f96261..0d15c60 100644
 
  CGAL_EXACT = /*-DCGAL_DONT_USE_LAZY_KERNEL*/
 diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options
-index cd23364..d1c9939 100644
+index cd23364..4a76976 100644
 --- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options
 +++ b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/Make/options
 @@ -1,5 +1,9 @@
@@ -219,6 +219,16 @@ index cd23364..d1c9939 100644
  EXE_NDEBUG = -DNDEBUG
 
  CGAL_EXACT = /*-DCGAL_DONT_USE_LAZY_KERNEL*/
+@@ -25,8 +29,7 @@ EXE_INC = \
+     -I$(LIB_SRC)/sampling/lnInclude \
+     -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
+     -IPrintTable \
+-    -I../vectorTools \
+-    -I/usr/include
++    -I../vectorTools
+
+ LIB_LIBS = \
+     ${CGAL_LIBS} \
 diff --git a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C b/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
 index 148de2b..e49e35f 100644
 --- a/applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecompositionTemplates.C
@@ -2729,16 +2739,19 @@ index 0000000..c6600bf
 +LINKEXE     = $(cc) -Wl,-execute,-undefined,dynamic_lookup
 diff --git a/wmake/rules/darwin64Clang/c++ b/wmake/rules/darwin64Clang/c++
 new file mode 100644
-index 0000000..6228651
+index 0000000..f452dbb
 --- /dev/null
 +++ b/wmake/rules/darwin64Clang/c++
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,26 @@
 +.SUFFIXES: .C .cxx .cc .cpp
 +
 +c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wno-overloaded-virtual \
-+              -Wno-c++11-extensions -Wno-unused-variable -Wno-unused-local-typedef
++              -Wno-c++11-extensions -Wno-unused-variable -Wno-unused-local-typedef \
++	      -Wno-deprecated-register
++
++c++CGALWARN = -Wno-shift-negative-value
 +
-+CC          = xcrun c++ -arch x86_64
++CC          = xcrun c++ -arch x86_64 -std=c++14
 +
 +include $(RULES)/c++$(WM_COMPILE_OPTION)
 +

diff --git a/OpenFOAM-4.x-2ac98b5.patch → OpenFOAM-4.x-62dd439.patch b/OpenFOAM-4.x-2ac98b5.patch → OpenFOAM-4.x-62dd439.patch
@@ -46,7 +46,7 @@
  src/parallel/decompose/ptscotchDecomp/Make/options |  10 +-
  src/parallel/decompose/scotchDecomp/Make/options   |   8 +-
  src/renumber/Allwmake                              |  12 +-
- src/renumber/SloanRenumber/Make/options            |  31 +++--
+ src/renumber/SloanRenumber/Make/options            |  16 ++-
  wmake/makefiles/files                              |   5 +-
  wmake/makefiles/general                            |  58 ++++++++-
  wmake/rules/General/CGAL                           |   7 +-
@@ -63,7 +63,7 @@
  wmake/src/Makefile                                 |   1 +
  wmake/src/wmkdep.l                                 |  14 ++-
  wmake/wmakeLnInclude                               |   7 +-
- 65 files changed, 1543 insertions(+), 102 deletions(-)
+ 65 files changed, 1537 insertions(+), 93 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
 index a897b81..8f59031 100644
@@ -2338,30 +2338,23 @@ index a44d239..5fa67c0 100755
  ## Get ZOLTAN_ARCH_PATH
  #if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan`
 diff --git a/src/renumber/SloanRenumber/Make/options b/src/renumber/SloanRenumber/Make/options
-index 492a3ae..29597e3 100644
+index 0bf3c77..81ee45d 100644
 --- a/src/renumber/SloanRenumber/Make/options
 +++ b/src/renumber/SloanRenumber/Make/options
-@@ -1,12 +1,21 @@
--EXE_INC = \
+@@ -1,12 +1,24 @@
+ EXE_INC = \
 -    /* -DFULLDEBUG -g -O0 */ \
--    -I$(BOOST_ARCH_PATH)/include \
--    -I$(LIB_SRC)/meshTools/lnInclude \
--    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
--    -I$(LIB_SRC)/renumber/renumberMethods/lnInclude
-+EXE_INC = -I$(BOOST_ARCH_PATH)/include \
-+	  -I$(LIB_SRC)/meshTools/lnInclude \
-+	  -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-+	  -I$(LIB_SRC)/renumber/renumberMethods/lnInclude
+     -I$(BOOST_ARCH_PATH)/include \
+     -I$(LIB_SRC)/meshTools/lnInclude \
+     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+     -I$(LIB_SRC)/renumber/renumberMethods/lnInclude
 
--LIB_LIBS = \
--    -L$(BOOST_ARCH_PATH)/lib -lboost_thread \
--    -lmeshTools \
--    -ldecompositionMethods \
--    -lrenumberMethods
-+LIB_LIBS = -L$(BOOST_ARCH_PATH)/lib \
-+	   -lmeshTools \
-+	   -ldecompositionMethods \
-+	   -lrenumberMethods
+ LIB_LIBS = \
+-    -L$(BOOST_ARCH_PATH)/lib -lboost_system \
++    -L$(BOOST_ARCH_PATH)/lib \
+     -lmeshTools \
+     -ldecompositionMethods \
+     -lrenumberMethods
 +
 +ifeq ($(shell uname -s),Darwin)
 +SO = dylib
@@ -2370,10 +2363,11 @@ index 492a3ae..29597e3 100644
 +endif
 +
 +ifneq ("$(wildcard $(BOOST_ARCH_PATH)/lib/libboost_thread-mt.$(SO))","")
-+LIB_LIBS += -lboost_thread-mt
++LIB_LIBS += -lboost_system-mt
 +else
-+LIB_LIBS += -lboost_thread
++LIB_LIBS += -lboost_system
 +endif
++
 diff --git a/wmake/makefiles/files b/wmake/makefiles/files
 index c17179e..bb0e3d4 100644
 --- a/wmake/makefiles/files

diff --git a/README.md b/README.md
@@ -3,6 +3,11 @@
 Patches for OpenFOAM compilation on OS X. Detailed installation instructions
 can be found in [wiki](https://github.com/mrklein/openfoam-os-x/wiki).
 
+## July 30, 2016
+
+Updated 2.4.x (problem with `/usr/include` in -I flags for CGAL) and 4.x
+(new commits in this branch) patches.
+
 ## June 29, 2016
 
 Patches for 4.0 and 4.x (well, slight modification of the last -dev patch).

diff --git a/files/openfoam-env-setup.sh b/files/openfoam-env-setup.sh
@@ -53,6 +53,8 @@ ofxxx () {
 	fi
 }
 
+export -f ofxxx
+
 of22x () {
 	ofxxx "2.2.x"
 }