[121142] trunk/dports/science/root6

[mojca at macports.org]

Revision: 121142
          https://trac.macports.org/changeset/121142
Author:   mojca at macports.org
Date:     2014-06-18 11:01:53 -0700 (Wed, 18 Jun 2014)
Log Message:
-----------
root6: preliminary patches for 10.6 (#44062)

Modified Paths:
--------------
    trunk/dports/science/root6/Portfile

Added Paths:
-----------
    trunk/dports/science/root6/files/patch-cmake-modules-SearchInstalledSoftware.cmake.diff

Modified: trunk/dports/science/root6/Portfile
===================================================================
--- trunk/dports/science/root6/Portfile	2014-06-18 17:42:17 UTC (rev 121141)
+++ trunk/dports/science/root6/Portfile	2014-06-18 18:01:53 UTC (rev 121142)
@@ -58,6 +58,8 @@
 select.group        root
 select.file         ${filespath}/${name}
 
+patchfiles          patch-cmake-modules-SearchInstalledSoftware.cmake.diff
+
 # Force a compatible compiler
 # (macports-clang-3.3 works; it's blacklisted only to give the preference to 3.4)
 compiler.blacklist-append *gcc* {clang < 500} macports-clang-2.9 macports-clang-3.0 macports-clang-3.1 macports-clang-3.2 macports-clang-3.3
@@ -416,14 +418,15 @@
 
 variant cocoa conflicts x11 description {Enables native OSX graphical backend} {
     # Enable cocoa support in configure
-    configure.args-append   -Dcocoa=ON
+    configure.args-append   -Dcocoa=ON -Dx11=OFF
 }
 
 variant x11 conflicts cocoa description {Enables X11 graphical backend} {
     # Dependencies on X11 ports
     depends_lib-append      port:xorg-libX11 port:mesa port:Xft2 port:xpm
     # Disable cocoa
-    configure.args-append   -Dcocoa=OFF
+    configure.args-append   -Dcocoa=OFF -Dx11=ON
+    # TODO: configuration to find X11 libraries from MacPorts instead of external ones
 }
 
 # If neither graphical variant is set, use default
@@ -480,6 +483,14 @@
     depends_run-append      port:clang-${active_clang_variant}
 }
 
+# TODO:
+# replace
+#   -DCMAKE_OSX_SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
+#   -DCMAKE_OSX_DEPLOYMENT_TARGET="10.6"
+# with
+#   -DCMAKE_OSX_SYSROOT="/"
+#   -DCMAKE_OSX_DEPLOYMENT_TARGET=""
+
 # ========================================================================================
 # Following is for fortran support
 # Might eventually move to a portgroup, or similar, so could be simplified.

Added: trunk/dports/science/root6/files/patch-cmake-modules-SearchInstalledSoftware.cmake.diff
===================================================================
--- trunk/dports/science/root6/files/patch-cmake-modules-SearchInstalledSoftware.cmake.diff	                        (rev 0)
+++ trunk/dports/science/root6/files/patch-cmake-modules-SearchInstalledSoftware.cmake.diff	2014-06-18 18:01:53 UTC (rev 121142)
@@ -0,0 +1,29 @@
+--- cmake/modules/SearchInstalledSoftware.cmake.orig
++++ cmake/modules/SearchInstalledSoftware.cmake
+@@ -592,6 +592,8 @@ if(builtin_xrootd)
+                -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+                -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+                -DCMAKE_CXX_FLAGS=${__cxxflags}
++               -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
++               -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
+   )
+   # We cannot call find_package(XROOTD) becuase the package is not yet built. So, we need to emulate what it defines....
+   set(_LIBDIR_DEFAULT "lib")
+@@ -644,6 +646,8 @@ if(cling)
+                  -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+                  -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+                  -DLLVM_NOCLING=ON
++                 -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
++                 -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
+       INSTALL_COMMAND ${CMAKE_COMMAND} -P <BINARY_DIR>/cmake_install.cmake
+       LOG_INSTALL 1
+     )
+@@ -724,6 +728,8 @@ if(cling)
+                -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+                -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+                -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
++               -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
++               -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
+     INSTALL_COMMAND ${CMAKE_COMMAND} -P <BINARY_DIR>/cmake_install.cmake
+     LOG_INSTALL 1
+   )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140618/26ca0b73/attachment.html>