[121157] trunk/dports/science/root6

[mojca at macports.org]

Revision: 121157
          https://trac.macports.org/changeset/121157
Author:   mojca at macports.org
Date:     2014-06-18 13:13:03 -0700 (Wed, 18 Jun 2014)
Log Message:
-----------
root6: upgrade to 6.00.01, add a patch for 10.6 (#44062)

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

Added Paths:
-----------
    trunk/dports/science/root6/files/patch-montecarlo-vmc-inc-TMCtls.h.diff

Modified: trunk/dports/science/root6/Portfile
===================================================================
--- trunk/dports/science/root6/Portfile	2014-06-18 19:55:46 UTC (rev 121156)
+++ trunk/dports/science/root6/Portfile	2014-06-18 20:13:03 UTC (rev 121157)
@@ -9,14 +9,11 @@
 PortGroup           github 1.0
 PortGroup           select 1.0
 
-# Essentially 6.00.00, but with some bug fixes to the build system
-github.setup        root-mirror root aaf9b65
-#github.setup       root-mirror root 6-00-00 v
+github.setup        root-mirror root 6-00-01 v
 version             6.00.00
 set version_major   [lindex [split ${version} .] 0]
-revision            1
-checksums           rmd160  e0b7080d897469f421dd5ee44ca570a4774dc5d4 \
-                    sha256  58692b7e2c970df5eac0dd298ab7d1ac5352e4ed549d61c29578d71915e831be
+checksums           rmd160  6ee9fd3c7ea5a11bf67331a5f24d5839f4ba67a0 \
+                    sha256  ad3b64a44e25b05a666f05a7b12e4b9a4488ede5c68839c1151d13a348b3bf7f
 
 name                root${version_major}
 categories          science
@@ -60,6 +57,12 @@
 
 patchfiles          patch-cmake-modules-SearchInstalledSoftware.cmake.diff
 
+# an ugly workaround for lack of __thread on 10.6
+platform darwin 10 {
+    patchfiles-append \
+                    patch-montecarlo-vmc-inc-TMCtls.h.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

Added: trunk/dports/science/root6/files/patch-montecarlo-vmc-inc-TMCtls.h.diff
===================================================================
--- trunk/dports/science/root6/files/patch-montecarlo-vmc-inc-TMCtls.h.diff	                        (rev 0)
+++ trunk/dports/science/root6/files/patch-montecarlo-vmc-inc-TMCtls.h.diff	2014-06-18 20:13:03 UTC (rev 121157)
@@ -0,0 +1,15 @@
+http://trac.macports.org/ticket/44062
+
+--- montecarlo/vmc/inc/TMCtls.h.orig
++++ montecarlo/vmc/inc/TMCtls.h
+@@ -49,8 +49,8 @@
+         ( defined(__MACH__) && defined(__GNUC__) && __GNUC__>=4 && __GNUC_MINOR__>=7 ) || \
+         defined(__linux__) || defined(_AIX) ) && ( !defined(__CINT__) )
+       //  Multi-threaded build: for POSIX systems 
+-      #include <pthread.h>
+-      #define TMCThreadLocal __thread
++//    #include <pthread.h>
++      #define TMCThreadLocal
+   #else
+       //#  error "No Thread Local Storage (TLS) technology supported for this platform. Use sequential build !"
+       #define TMCThreadLocal 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140618/d2f65108/attachment.html>