[Lunar-commits] <moonbase> vtk: Some changes to the BUILD and DEPENDS.

[Dennis `stumbles` Veatch]

commit 18bff7ddc3bd1477a4ec4d69eba9771ff655109e
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Sat Feb 12 22:02:28 2011 -0500

    vtk: Some changes to the BUILD and DEPENDS.
---
 science/vtk/BUILD   |   48 +++++++++++++++++++++++++++---------------------
 science/vtk/DEPENDS |   30 +++++++++++++++++-------------
 2 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/science/vtk/BUILD b/science/vtk/BUILD
index 6422229..d4b88a5 100644
--- a/science/vtk/BUILD
+++ b/science/vtk/BUILD
@@ -1,29 +1,35 @@
 (
 
-  sedit "s:2.6:2.7:" CMake/FindPythonLibs.cmake &&
-  sedit "s:/usr/local/lib:/usr/lib/R:g" CMake/FindR.cmake &&
+  OOSB_DIR="$SOURCE_DIRECTORY/$MODULE-build" &&
 
-  if module_installed sun-jdk ; then
-    . /etc/profile.d/sun-jdk.rc
-   else
-    . /etc/profile.d/sun-jre
+  mkdir $OOSB_DIR &&
+  cd $OOSB_DIR    &&
+
+# Fix some version numbers so it will find ours.
+  BOOST_VER="`lvu version boost`" &&
+  PYTHON_VER="`lvu version Python|cut -c 1-3`" &&
+  sedit "s:2.6:$PYTHON_VER:" ../CMake/FindPythonLibs.cmake &&
+  sedit "s:1.36.1:$BOOST_VER:" ../CMake/CMake2.4/FindBoost.cmake &&
+
+# This is a similar issue as found in the graphviz BUILD; so lunar fix 
+# does not complain over the inability to find some shared ojbects.
+  if module_installed sun-jdk; then
+     . /etc/profile.d/sun-jdk.rc &&
+     OPTS="-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,/usr/java/jdk1.6.0_23/jre/lib/amd64"
+    else
+     . /etc/profile.d/sun-jre
+  fi &&
+
+# So it doesn't barf on the make if ffmpeg is used.
+  if in_depends $MODULE ffmpeg; then
+     OPTS="-DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS"
   fi &&
 
-  OOSB_DIR="$SOURCE_DIRECTORY/$MODULE-build"  &&
-
-  mkdir $OOSB_DIR  &&
-  cd $OOSB_DIR     &&
-
-# For now disable or use proj4, odbc and R from VTK 
-  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
-                           -DCMAKE_BUILD_TYPE=RELEASE             \
-                           -DBUILD_SHARED_LIBS=ON                 \
-                           -DBUILD_EXAMPLES=OFF                   \
-                           -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
-                           -DVTK_USE_SYSTEM_LIBPROJ4=OFF          \ 
-                           -DVTK_USE_GNU_R=OFF                    \
-                           -DVTK_USE_ODBC=OFF                     \
-                           $OPTS                                 &&
+  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX   \
+                           -DBUILD_TYPE=RELEASE                    \
+                           -DBUILD_SHARED_LIBS=ON                  \
+                           -DBUILD_EXAMPLES=OFF                    \
+                           $OPTS                                  &&
 
   default_make
 
diff --git a/science/vtk/DEPENDS b/science/vtk/DEPENDS
index 6f4b507..7b4cfef 100644
--- a/science/vtk/DEPENDS
+++ b/science/vtk/DEPENDS
@@ -38,6 +38,10 @@ optional_depends Python "-DVTK_WRAP_PYTHON=ON"  \
                         "-DVTK_WRAP_PYTHON=OFF" \
                         "for python wrappers support"
 
+optional_depends boost "-DVTK_USE_BOOST=ON"   \
+                       "-DVTK_USE_BOOST=OFF"  \
+                       "for boost support"
+
 optional_depends tcl "-DVTK_WRAP_TCL=ON"  \
                      "-DVTK_WRAP_TCL=OFF" \
                      "for tcl wrappers support"
@@ -58,9 +62,9 @@ optional_depends mysql  "-DVTK_USE_MYSQL=ON" \
                         "-DVTK_USE_MYSQL=OFF" \
                         "for musql database support"
 
-#optional_depends unixODBC "-DVTK_USE_ODBC=ON"  \
-#                          "-DVTK_USE_ODBC=OFF" \
-#                          "for ODBC support"
+optional_depends unixODBC "-DVTK_USE_ODBC=ON"  \
+                          "-DVTK_USE_ODBC=OFF" \
+                          "for ODBC support"
 
 optional_depends postgresql "-DVTK_USE_POSTGRES=ON"  \
                             "-DVTK_USE_POSTGRES=OFF" \
@@ -75,15 +79,15 @@ optional_depends OpenSceneGraph "-DVTK_USE_GLSL_SHADERS=ON"  \
                                 "-DVTK_USE_GLSL_SHADERS=OFF" \
                                 "for pixel and vertex shader support"
 
-#optional_depends R    "-DVTK_USE_GNU_R=ON -DVTK_USE_GUISUPPORT=ON       \
-#                       -DR_INCLUDE_DIR=/usr/lib/R/include/              \
-#                       -DR_LIBRARY_BLAS=/usr/lib/R/lib/libRblas.so      \
-#                       -R_LIBRARY_LAPACK=/usr/lib/R/lib/libRlapack.so"  \
-#                      "-DVTK_USE_GNU_R=OFF -DVTK_USE_GUISUPPORT=OFF"    \
-#                      "for R interface support"
+optional_depends R    "-DVTK_USE_GNU_R=ON -DVTK_USE_GUISUPPORT=ON       \
+                       -DR_INCLUDE_DIR=/usr/lib/R/include/              \
+                       -DR_LIBRARY_BLAS=/usr/lib/R/lib/libRblas.so      \
+                       -R_LIBRARY_LAPACK=/usr/lib/R/lib/libRlapack.so"  \
+                      "-DVTK_USE_GNU_R=OFF -DVTK_USE_GUISUPPORT=OFF"    \
+                      "for R interface support"
 
 
-#optional_depends proj-4 "-DVTK_USE_SYSTEM_LIBPROJ4=ON -DLIBPROJ4_INCLUDE_DIR=/usr/include \
-#                         -DLIBPROJ4_LIBRARIES=/usr/lib"  \
-#                        "-DVTK_USE_SYSTEM_LIBPROJ4=OFF" \
-#                        "for Cartographic Projections support"
+optional_depends proj-4 "-DVTK_USE_SYSTEM_LIBPROJ4=ON -DLIBPROJ4_INCLUDE_DIR=/usr/include \
+                         -DLIBPROJ4_LIBRARIES=/usr/lib"  \
+                        "-DVTK_USE_SYSTEM_LIBPROJ4=OFF" \
+                        "for Cartographic Projections support"