Ticket #45265: root.2.diff

File root.2.diff, 3.2 KB (added by cjones051073 (Chris Jones), 10 years ago)

new patch

  • Portfile

     
    99PortGroup           github 1.0
    1010PortGroup           select 1.0
    1111
     12# don't forget to update both the git tag and the version
     13#github.setup        root-mirror root 6-02-00 v
     14# tag below is 6.02/00 + a few minor fixes for installation issues.
     15github.setup        root-mirror root f460f42728305617c4978ced32bd030b1b4279e0
     16version             6.02.00
    1217
    13 # don't forget to update both the git tag and the version
    14 github.setup        root-mirror root 6-00-02 v
    15 version             6.00.02
    16 revision            2
    1718# this could be a better way to set the version (unless we use a sha sum for the git tag ;)
    1819# version           [string map {- .} $version]
    1920set version_major   [lindex [split ${version} .] 0]
    20 checksums           rmd160  5efc28e5d68aaa4274d869c809c4d052d6011fe4 \
    21                     sha256  6e6fa7fbe0fe72828a6a65f758af9e1fcb04b66dec7fae79ecbe06e81692b218
    2221
     22checksums           rmd160  46c38ab178b114794b2f53cfdd59b41e53470223 \
     23                    sha256  cfa9d3daadb05ff527d75ec5959bb1ca3d0ea2f200a09ec1959dc0ef9dba2389
     24
    2325name                root${version_major}
    2426categories          science
    2527maintainers         hep.phy.cam.ac.uk:jonesc mojca
     
    6062select.group        root
    6163select.file         ${filespath}/${name}
    6264
    63 patchfiles          patch-cmake-modules-SearchInstalledSoftware.cmake.diff
    64 
    6565# Force a compatible compiler
    6666compiler.blacklist-append *gcc* {clang < 500} macports-clang-2.9 macports-clang-3.0 macports-clang-3.1 macports-clang-3.2
    6767compiler.fallback-append macports-clang-3.4 macports-clang-3.5
     
    567567# Note that g95 does not work here, so that variant is removed
    568568# ========================================================================================
    569569
    570 set gcc_versions { 4.7 4.8 4.9 }
     570set gcc_versions { 4.7 4.8 4.9 4.10 }
    571571set default_fortran_variant +gcc48
    572572
    573573foreach gcc_ver ${gcc_versions} {
  • files/patch-montecarlo-vmc-inc-TMCtls.h.diff

     
    1 https://sft.its.cern.ch/jira/browse/ROOT-6394
    2 
    3 --- montecarlo/vmc/inc/TMCtls.h.orig
    4 +++ montecarlo/vmc/inc/TMCtls.h
    5 @@ -49,8 +49,8 @@
    6          ( defined(__MACH__) && defined(__GNUC__) && __GNUC__>=4 && __GNUC_MINOR__>=7 ) || \
    7          defined(__linux__) || defined(_AIX) ) && ( !defined(__CINT__) )
    8        //  Multi-threaded build: for POSIX systems
     1--- ./montecarlo/vmc/inc/TMCtls.h.orig  2014-10-03 11:59:47.000000000 +0100
     2+++ ./montecarlo/vmc/inc/TMCtls.h       2014-10-03 12:00:24.000000000 +0100
     3@@ -52,8 +52,8 @@
     4 */
     5   #if ( defined(__linux__) ) && ( !defined(__CINT__) )
     6       //  Multi-threaded build: for POSIX systems
    97-      #include <pthread.h>
    108-      #define TMCThreadLocal __thread
    11 +//    #include <pthread.h>
     9+      //#include <pthread.h>
    1210+      #define TMCThreadLocal
    1311   #else
    1412       //#  error "No Thread Local Storage (TLS) technology supported for this platform. Use sequential build !"
    15        #define TMCThreadLocal 
     13       #define TMCThreadLocal