Changeset 143637


Ignore:
Timestamp:
Dec 16, 2015, 1:56:33 PM (3 years ago)
Author:
mojca@…
Message:

root: upgrade root6 to 6.06.00, fix gsl in root5 (closes #50007, #50011)

root6:

  • upgrade to version 6.06.00
  • cocoa is always the default variant (the Portfile currently doesn't support 10.6 anyway)
  • introduce a new variant cxx14 (enabled by default on Xcode 6.3 and later)
  • add support for compiling with clang 3.8
  • (closes #50011)

root5:

  • fix compatibility with GSL v2
  • make +gsl the default variant again (reverts r142498)
  • (closes #50007)

root_select:

  • add more files from the new root6 version
Location:
trunk/dports
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/science/root5/Portfile

    r142498 r143637  
    1111github.setup        root-mirror root 5-34-34 v
    1212version             5.34.34
    13 revision            1
     13revision            2
    1414
    1515set version_major   [lindex [split ${version} .] 0]
     
    5050select.group        root
    5151select.file         ${filespath}/${name}
     52
     53patchfiles-append   patch-math-mathmore-src-GSLMultiFit.h.diff
    5254
    5355post-patch {
     
    188190universal_variant   no
    189191
    190 default_variants    +ssl +xml +minuit2 +tmva +roofit +graphviz +opengl +soversion +http
     192default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http
    191193
    192194# Since ROOT 5.34.15 the cocoa backend is default on OSX 10.8 or newer
  • trunk/dports/science/root5/files/root5

    r124013 r143637  
    2828libexec/root5/bin/thisroot.sh
    2929libexec/root5/bin/xpdtest
     30-
     31-
     32-
     33-
     34-
     35-
     36-
     37-
    3038-
    3139libexec/root5/share/man/man1/cint.1.gz
  • trunk/dports/science/root6/Portfile

    r143274 r143637  
    1 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
     1    # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    22# $Id$
    33
     
    99PortGroup           github 1.0
    1010PortGroup           select 1.0
     11PortGroup           xcodeversion 1.0
    1112
    1213# don't forget to update both the git tag and the version
    1314#github.setup       root-mirror root <sha>
    14 github.setup        root-mirror root 6-04-12 v
    15 version             6.04.12
     15github.setup        root-mirror root 6-06-00 v
     16version             6.06.00
    1617
    1718# this could be a better way to set the version (unless we use a sha sum for the git tag ;)
     
    1920set version_major   [lindex [split ${version} .] 0]
    2021
    21 checksums           rmd160  a607eb11c3e84c8e61c1c7dcdad5de7daa0c998c \
    22                     sha256  140de60f190970453dd0c53aa27b33fa73fe1c8a6e863620a4c6fb9ac9a975a2
     22checksums           rmd160  84ce0e3b637e2cc81cc4d6c598118e50d5f18125 \
     23                    sha256  90416cd4d836b8ca48c2e31cc7774a5e35ee21f0748596487e39fa0af2cf2324
    2324
    2425name                root${version_major}
     
    6162
    6263# Force a compatible compiler
     64#compiler.blacklist-append *gcc* {clang < 602}  macports-clang-3.4 macports-clang-3.3
     65#compiler.fallback-append  macports-clang-3.7 macports-clang-3.6 macports-clang-3.5
    6366compiler.blacklist-append *gcc* {clang < 500} macports-clang-3.3
    64 compiler.fallback-append  macports-clang-3.7 macports-clang-3.6 macports-clang-3.5 \
    65                           macports-clang-3.4
     67compiler.fallback-append  macports-clang-3.7 macports-clang-3.6 macports-clang-3.5
    6668
    6769# port specific location
     
    125127                    -Dastiff=ON \
    126128                    -Dgeocad=OFF \
     129                    -Dr=OFF \
    127130                    -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
    128131                    -DPNG_PNG_INCLUDE_DIR=${prefix}/include
     
    170173
    171174post-destroot {
    172     # create versioned symlinks for the content of libexec
    173     # bin dir
     175    # Temporary - Set execute flag on binaries (broken in 6.06.00)
     176    foreach f [glob -directory ${destroot}${install_prefix}/bin *] {
     177        system "chmod +x $f"
     178    }
     179    # create versioned symlinks for the content of libexec bin dir
    174180    foreach f [glob -directory ${destroot}${install_prefix}/bin *] {
    175181        set filename  [file tail $f]
     
    225231universal_variant   no
    226232
    227 default_variants    +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http
    228 
    229 # Since ROOT 5.34.15 the cocoa backend is default on OSX 10.8 or newer
    230 # We also make it default on 10.7
    231 if {${os.major} > 10} {
    232     set default_gui_variant +cocoa
    233 } else {
    234     set default_gui_variant +x11
    235 }
    236 
    237 # variant geocad description {Enable CAD Interface} {
    238 #     configure.args-replace  -Dgeocad=OFF -Dgeocad=ON
    239 #     depends_lib-append      port:oce
    240 #     configure.args-append   -DOCC_INCLUDE_DIR="${prefix}/include/oce"
    241 # }
     233default_variants    +cocoa +ssl +xml +gsl +minuit2 +tmva +roofit +graphviz +opengl +soversion +http
     234
     235# Enable C++14 by default when Xcode allows (Xcode 6.3 onwards)
     236if { [vercmp $xcodeversion "6.3"] >= 0 } {
     237    default_variants-append +cxx14
     238}
    242239
    243240variant qt4 description {Enable QT4 support} {
     
    248245variant cxx14 description {Enable c++14 compiler support} {
    249246    configure.args-replace  -Dcxx14=OFF -Dcxx14=ON
     247    # Update compiler blacklist to force use of MP's Clang 3.7 when required
     248    compiler.blacklist-append {clang < 602} macports-clang-3.4
    250249}
    251250
     
    424423                reinplace "s|${pystringtoreplace}|${prefix}/bin/python${active_python_version}|g" $f
    425424            }
     425            foreach f [ exec find ${destroot}${install_prefix}/bin -type f | xargs grep -Il ${pystringtoreplace} ] {
     426                reinplace "s|${pystringtoreplace}|${prefix}/bin/python${active_python_version}|g" $f
     427            }
    426428        }
    427429
     
    488490    configure.args-replace -Dpgsql=OFF -Dpgsql=ON
    489491    configure.args-append  -DPOSTGRESQL_INCLUDE_DIR="${prefix}/include/postgresql90"\
    490                            -DPOSTGRESQL_LIBRARIES="${prefix}/lib/postgresql90/libpq.dylib"
     492                           -DPOSTGRESQL_LIBRARY="${prefix}/lib/postgresql90/libpq.dylib"
    491493    depends_lib-append      port:libpqxx port:postgresql90
    492494}
     
    495497    configure.args-replace -Dpgsql=OFF -Dpgsql=ON
    496498    configure.args-append  -DPOSTGRESQL_INCLUDE_DIR="${prefix}/include/postgresql92" \
    497                            -DPOSTGRESQL_LIBRARIES="${prefix}/lib/postgresql92/libpq.dylib"
     499                           -DPOSTGRESQL_LIBRARY="${prefix}/lib/postgresql92/libpq.dylib"
    498500    depends_lib-append      port:libpqxx port:postgresql92
    499501}
     
    541543}
    542544
    543 # If neither graphical variant is set, use default
    544 if { ![variant_isset cocoa] && ![variant_isset x11] } {
    545     default_variants-append ${default_gui_variant}
    546 }
    547 
    548545# ========================================================================================
    549546# Setup various clang variants, to provide alternative C++ compilers that support cocoa
     
    551548
    552549# List of possible clang versions that work
    553 set clang_versions { 3.4 3.5 3.6 3.7 }
     550set clang_versions { 3.4 3.5 3.6 3.7 3.8 }
    554551
    555552# Define the available variants
     
    568565# make sure that the proper variant is automatically selected
    569566# (ROOT crashes if the compiler it was built with doesn't exist)
    570 if { ![variant_isset clang33] && ![variant_isset clang34] &&
    571      ![variant_isset clang35] && ![variant_isset clang36] &&
    572      ![variant_isset clang37] } {
    573     if       { ${configure.compiler} eq "macports-clang-3.3" } {
    574         default_variants-append +clang33
    575     } elseif { ${configure.compiler} eq "macports-clang-3.4" } {
     567if { ![variant_isset clang34] &&
     568     ![variant_isset clang35] &&
     569     ![variant_isset clang36] &&
     570     ![variant_isset clang37] &&
     571     ![variant_isset clang38] } {
     572    if      { ${configure.compiler} eq "macports-clang-3.4" } {
    576573        default_variants-append +clang34
    577574    } elseif { ${configure.compiler} eq "macports-clang-3.5" } {
     
    581578    } elseif { ${configure.compiler} eq "macports-clang-3.7" } {
    582579        default_variants-append +clang37
     580    } elseif { ${configure.compiler} eq "macports-clang-3.8" } {
     581        default_variants-append +clang38
    583582    }
    584583}
     
    656655# ========================================================================================
    657656
    658 # Problems finding includes ...
     657# Various variants etc. with problems. Work in progress...
     658
    659659# variant ruby description {Build with ruby support} {
    660660#     configure.args-replace  -Druby=OFF -Druby=ON
     
    666666# livecheck.url               http://root.cern.ch/svn/root/trunk
    667667# livecheck.regex             ${name}_v(\[0-9a-z.\]+)\\.source
     668
     669# variant geocad description {Enable CAD Interface} {
     670#     configure.args-replace  -Dgeocad=OFF -Dgeocad=ON
     671#     depends_lib-append      port:oce
     672#     configure.args-append   -DOCC_INCLUDE_DIR="${prefix}/include/oce"
     673# }
     674
     675# variant r description {Enable R support} {
     676#     configure.args-replace  -Dr=OFF -Dr=ON
     677#     depends_lib-append  port:R
     678# }
  • trunk/dports/science/root6/files/root6

    r124014 r143637  
    2929-
    3030libexec/root6/bin/rootcling
     31libexec/root6/bin/rootbrowse
     32libexec/root6/bin/rootcp
     33libexec/root6/bin/rooteventselector
     34libexec/root6/bin/rootls
     35libexec/root6/bin/rootmkdir
     36libexec/root6/bin/rootmv
     37libexec/root6/bin/rootprint
     38libexec/root6/bin/rootrm
    3139-
    3240libexec/root6/share/man/man1/g2root.1.gz
    3341libexec/root6/share/man/man1/g2rootold.1.gz
    3442libexec/root6/share/man/man1/genmap.1.gz
    35 libexec/root6/share/man/man1/genreflex-rootcint.1.gz
    36 libexec/root6/share/man/man1/genreflex.1.gz
     43-
     44-
    3745libexec/root6/share/man/man1/h2root.1.gz
    3846libexec/root6/share/man/man1/hadd.1.gz
     
    5563libexec/root6/share/man/man1/proofserv.1.gz
    5664libexec/root6/share/man/man1/proofserva.1.gz
    57 libexec/root6/share/man/man1/rlibmap.1.gz
     65-
    5866libexec/root6/share/man/man1/rmkdepend.1.gz
    5967libexec/root6/share/man/man1/root-config.1.gz
     
    7078libexec/root6/share/man/man1/xpdtest.1.gz
    7179libexec/root6/share/man/man1/xproofd.1.gz
    72 libexec/root6/share/man/man1/rootcling.1.gz
     80-
    7381libexec/root6/etc/root
    7482libexec/root6/include/root
  • trunk/dports/sysutils/root_select/Portfile

    r124012 r143637  
    66
    77name                root_select
    8 version             1.1
     8version             1.2
    99
    1010categories          sysutils science
  • trunk/dports/sysutils/root_select/files/base

    r124012 r143637  
    2929bin/xpdtest
    3030bin/rootcling
     31bin/rootbrowse
     32bin/rootcp
     33bin/rooteventselector
     34bin/rootls
     35bin/rootmkdir
     36bin/rootmv
     37bin/rootprint
     38bin/rootrm
    3139share/man/man1/cint.1.gz
    3240share/man/man1/g2root.1.gz
  • trunk/dports/sysutils/root_select/files/none

    r124012 r143637  
    7474-
    7575-
     76-
     77-
     78-
     79-
     80-
     81-
     82-
     83-
Note: See TracChangeset for help on using the changeset viewer.