Changeset 105462


Ignore:
Timestamp:
Apr 21, 2013, 2:52:17 PM (7 years ago)
Author:
larryv@…
Message:

root: Update to 5.34.06, add clang3{2,3} variants (maintainer, #38868).

Also:

  • Prevent cocoa variant from using Clang 3.3.
  • Remove now-unnecessary patch to force use of system "file".
Location:
trunk/dports/science/root
Files:
1 deleted
1 edited

Legend:

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

    r104095 r105462  
    55
    66name                root
    7 version             5.34.05
    8 revision            1
     7version             5.34.06
    98categories          science
    109maintainers         gmail.com:mattiafrancescomoro hep.phy.cam.ac.uk:jonesc
     
    2019                    ftp://root.cern.ch/root/
    2120
    22 checksums           rmd160  eeb3c54b292ee6258c33d16ef28c03aa9fa077c3 \
    23                     sha256  448e180a5ed6f53b5ee49ead014a98e742e97198a4ca760f086467db5d230c9d
     21checksums           rmd160  643fd9b787f52843295b1e6ae8f22622141c3337 \
     22                    sha256  ddbec31fee5bd645203d8c464f98bb29e7ce2bc63976fba885c2ed0b1a09016a
    2423
    2524worksrcdir          root
     
    3837                    port:xpm \
    3938                    port:expat
    40 
    41 patchfiles          patch-configure.diff
    4239
    4340post-patch {
     
    369366    # Check we are using a clang compiler
    370367    pre-fetch {
    371         if { ![string match "*clang*" ${configure.compiler}] } {
     368        if { ![string match "*clang*" ${configure.compiler}] || [string match "macports-clang-3.3" ${configure.compiler}] } {
    372369            ui_error "The cocoa variant is experimental and can currently only be built"
    373             ui_error "using a clang compiler. Your current compiler is ${configure.compiler}."
    374             ui_error "Please try again using either the clang31 variant, or the system"
    375             ui_error "clang compiler using configure.compiler=clang"
     370            ui_error "using a clang(<3.3) compiler. Your current compiler is ${configure.compiler}."
     371            ui_error "Please try again using either of the clang31 or clang32 variants,"
     372            ui_error "or the system clang compiler using configure.compiler=clang"
    376373            return -code error "Unsupported compiler for cocoa support"
    377374        }
     
    384381}
    385382
    386 variant gcc45 conflicts gcc46 gcc47 gcc48 clang31 description {Compile using MacPorts gcc 4.5} {
     383variant gcc45 conflicts gcc46 gcc47 gcc48 clang31 clang32 clang33 description {Compile using MacPorts gcc 4.5} {
    387384    configure.compiler      macports-gcc-4.5
    388385    depends_lib-append      port:gcc45
    389386}
    390387
    391 variant gcc46 conflicts gcc45 gcc47 gcc48 clang31 description {Compile using MacPorts gcc 4.6} {
     388variant gcc46 conflicts gcc45 gcc47 gcc48 clang31 clang32 clang33 description {Compile using MacPorts gcc 4.6} {
    392389    configure.compiler      macports-gcc-4.6
    393390    depends_lib-append      port:gcc46
    394391}
    395392
    396 variant gcc47 conflicts gcc45 gcc46 gcc48 clang31 description {Compile using MacPorts gcc 4.7} {
     393variant gcc47 conflicts gcc45 gcc46 gcc48 clang31 clang32 clang33 description {Compile using MacPorts gcc 4.7} {
    397394    configure.compiler      macports-gcc-4.7
    398395    depends_lib-append      port:gcc47
    399396}
    400397
    401 variant gcc48 conflicts gcc45 gcc46 gcc47 clang31 description {Compile using MacPorts gcc 4.8} {
     398variant gcc48 conflicts gcc45 gcc46 gcc47 clang31 clang32 clang33 description {Compile using MacPorts gcc 4.8} {
    402399    configure.compiler      macports-gcc-4.8
    403400    depends_lib-append      port:gcc48
    404401}
    405402
    406 variant clang31 conflicts gcc45 gcc46 gcc47 gcc48 description {Compile using MacPorts clang 3.1} {
     403variant clang31 conflicts gcc45 gcc46 gcc47 gcc48 clang32 clang33 description {Compile using MacPorts clang 3.1} {
    407404    configure.compiler      macports-clang-3.1
    408405    depends_lib-append      port:clang-3.1
    409406    configure.args-append   --with-llvm-config="${prefix}/bin/llvm-config-mp-3.1"
     407}
     408
     409variant clang32 conflicts gcc45 gcc46 gcc47 gcc48 clang31 clang33 description {Compile using MacPorts clang 3.2} {
     410    configure.compiler      macports-clang-3.2
     411    depends_lib-append      port:clang-3.2
     412    configure.args-append   --with-llvm-config="${prefix}/bin/llvm-config-mp-3.2"
     413}
     414
     415variant clang33 conflicts gcc45 gcc46 gcc47 gcc48 clang31 clang32 description {Compile using MacPorts clang 3.3} {
     416    configure.compiler      macports-clang-3.3
     417    depends_lib-append      port:clang-3.3
     418    configure.args-append   --with-llvm-config="${prefix}/bin/llvm-config-mp-3.3"
    410419}
    411420
Note: See TracChangeset for help on using the changeset viewer.