Changeset 89315


Ignore:
Timestamp:
Jan 24, 2012, 10:31:47 PM (8 years ago)
Author:
ryandesign@…
Message:

Use new gcc-4.2 compiler selection block recommended at wiki:PortfileRecipes#compiler

Location:
trunk/dports
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/HandBrake/Portfile

    r88713 r89315  
    129129}
    130130
    131 if {${configure.compiler} == "clang" ||
    132     ${configure.compiler} == "llvm-gcc-4.2"} {
     131if {${configure.compiler} == "llvm-gcc-4.2"} {
    133132    configure.compiler gcc-4.2
    134     if {![file executable ${configure.cc}]} {
    135         depends_build-append port:apple-gcc42
    136         configure.compiler apple-gcc-4.2
    137         # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
    138         configure.cxx ${prefix}/bin/g++-apple-4.2
    139     }
     133} elseif {${configure.compiler} == "clang"} {
     134    depends_build-append port:apple-gcc42
     135    configure.compiler apple-gcc-4.2
     136    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     137    configure.cxx ${prefix}/bin/g++-apple-4.2
    140138}
    141139
  • trunk/dports/cross/i386-mingw32-gcc/Portfile

    r85594 r89315  
    5656
    5757# segfault when built with llvm on lion: #30349
    58 if {${configure.compiler} == "clang" || ${configure.compiler} == "llvm-gcc-4.2"} {
     58if {${configure.compiler} == "llvm-gcc-4.2"} {
    5959    configure.compiler gcc-4.2
    60     if {![file executable ${configure.cc}]} {
    61         depends_build-append port:apple-gcc42
    62         configure.compiler apple-gcc-4.2
    63     }
     60} elseif {${configure.compiler} == "clang"} {
     61    depends_build-append port:apple-gcc42
     62    configure.compiler apple-gcc-4.2
     63    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     64    configure.cxx ${prefix}/bin/g++-apple-4.2
    6465}
    6566
  • trunk/dports/emulators/qemu/Portfile

    r88048 r89315  
    4040
    4141# target-i386/exec.h:31:30: error: global register variables are not supported
    42 if {${configure.compiler} == "clang" ||
    43     ${configure.compiler} == "llvm-gcc-4.2"} {
     42if {${configure.compiler} == "llvm-gcc-4.2"} {
    4443    configure.compiler gcc-4.2
    45     if {![file executable ${configure.cc}]} {
    46         depends_build-append port:apple-gcc42
    47         configure.compiler apple-gcc-4.2
    48     }
     44} elseif {${configure.compiler} == "clang"} {
     45    depends_build-append port:apple-gcc42
     46    configure.compiler apple-gcc-4.2
     47    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     48    configure.cxx ${prefix}/bin/g++-apple-4.2
    4949}
    5050
  • trunk/dports/lang/ghc/Portfile

    r86459 r89315  
    357357
    358358
    359 if {${configure.compiler} == "clang" ||
    360     ${configure.compiler} == "llvm-gcc-4.2"} {
     359if {${configure.compiler} == "llvm-gcc-4.2"} {
    361360    configure.compiler gcc-4.2
    362     if {![file executable ${configure.cc}]} {
    363         depends_build-append port:apple-gcc42
    364         configure.compiler apple-gcc-4.2
    365         # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
    366         configure.cxx ${prefix}/bin/g++-apple-4.2
    367     }
     361} elseif {${configure.compiler} == "clang"} {
     362    depends_build-append port:apple-gcc42
     363    configure.compiler apple-gcc-4.2
     364    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     365    configure.cxx ${prefix}/bin/g++-apple-4.2
    368366}
    369367
  • trunk/dports/lang/ruby/Portfile

    r88384 r89315  
    6060# see list "MacPorts on Lion (common issues, fixes, and workarounds)"
    6161# http://lists.macosforge.org/pipermail/macports-dev/2011-July/015263.html
    62 if {${configure.compiler} == "clang" ||
    63     ${configure.compiler} == "llvm-gcc-4.2"} {
     62if {${configure.compiler} == "llvm-gcc-4.2"} {
    6463    configure.compiler gcc-4.2
    65     if {![file executable ${configure.cc}]} {
    66         depends_build-append port:apple-gcc42
    67         configure.compiler apple-gcc-4.2
    68     }
     64} elseif {${configure.compiler} == "clang"} {
     65    depends_build-append port:apple-gcc42
     66    configure.compiler apple-gcc-4.2
     67    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     68    configure.cxx ${prefix}/bin/g++-apple-4.2
    6969}
    7070
  • trunk/dports/lang/ruby186/Portfile

    r85594 r89315  
    6868# see list "MacPorts on Lion (common issues, fixes, and workarounds)"
    6969# http://lists.macosforge.org/pipermail/macports-dev/2011-July/015263.html
    70 if {${configure.compiler} == "clang" ||
    71     ${configure.compiler} == "llvm-gcc-4.2"} {
     70if {${configure.compiler} == "llvm-gcc-4.2"} {
    7271    configure.compiler gcc-4.2
    73     if {![file executable ${configure.cc}]} {
    74         depends_build-append port:apple-gcc42
    75         configure.compiler apple-gcc-4.2
    76     }
     72} elseif {${configure.compiler} == "clang"} {
     73    depends_build-append port:apple-gcc42
     74    configure.compiler apple-gcc-4.2
     75    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     76    configure.cxx ${prefix}/bin/g++-apple-4.2
    7777}
    7878
  • trunk/dports/lang/swi-prolog-devel/Portfile

    r88568 r89315  
    6868        --with-world
    6969
    70 if {${configure.compiler} == "clang" ||
    71         ${configure.compiler} == "llvm-gcc-4.2"} {
     70if {${configure.compiler} == "llvm-gcc-4.2"} {
    7271        configure.compiler gcc-4.2
    73         if {![file executable ${configure.cc}]} {
    74                 depends_build-append port:apple-gcc42
    75                 configure.compiler apple-gcc-4.2
    76         }
     72} elseif {${configure.compiler} == "clang"} {
     73        depends_build-append port:apple-gcc42
     74        configure.compiler apple-gcc-4.2
     75        # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     76        configure.cxx ${prefix}/bin/g++-apple-4.2
    7777}
    7878
  • trunk/dports/lang/swi-prolog/Portfile

    r85594 r89315  
    6666        --with-world
    6767
    68 if {${configure.compiler} == "clang" ||
    69         ${configure.compiler} == "llvm-gcc-4.2"} {
     68if {${configure.compiler} == "llvm-gcc-4.2"} {
    7069        configure.compiler gcc-4.2
    71         if {![file executable ${configure.cc}]} {
    72                 depends_build-append port:apple-gcc42
    73                 configure.compiler apple-gcc-4.2
    74         }
     70} elseif {${configure.compiler} == "clang"} {
     71        depends_build-append port:apple-gcc42
     72        configure.compiler apple-gcc-4.2
     73        # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     74        configure.cxx ${prefix}/bin/g++-apple-4.2
    7575}
    7676
  • trunk/dports/multimedia/MPlayer/Portfile

    r86915 r89315  
    6868universal_variant no
    6969
    70 if {${configure.compiler} == "clang" ||
    71     ${configure.compiler} == "llvm-gcc-4.2"} {
     70if {${configure.compiler} == "llvm-gcc-4.2"} {
    7271    configure.compiler gcc-4.2
    73     if {![file executable ${configure.cc}]} {
    74         depends_build-append port:apple-gcc42
    75         configure.compiler apple-gcc-4.2
    76         # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
    77         configure.cxx ${prefix}/bin/g++-apple-4.2
    78     }
     72} elseif {${configure.compiler} == "clang"} {
     73    depends_build-append port:apple-gcc42
     74    configure.compiler apple-gcc-4.2
     75    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     76    configure.cxx ${prefix}/bin/g++-apple-4.2
    7977}
    8078
  • trunk/dports/multimedia/ffmpeg-devel/Portfile

    r87372 r89315  
    9494#
    9595# similarly clang fails to build on i386 platforms
    96 #
    97 # use code provided by jeremyhu here to use gcc-4.2 instead
    98 #
    99 # http://lists.macosforge.org/pipermail/macports-dev/2011-July/015263.html
    100 #
    101 
    102 if {${configure.compiler} == "clang" ||
    103     ${configure.compiler} == "llvm-gcc-4.2"} {
     96if {${configure.compiler} == "llvm-gcc-4.2"} {
    10497    configure.compiler gcc-4.2
    105     if {![file executable ${configure.cc}]} {
    106         depends_build-append port:apple-gcc42
    107         configure.compiler apple-gcc-4.2
    108     }
     98} elseif {${configure.compiler} == "clang"} {
     99    depends_build-append port:apple-gcc42
     100    configure.compiler apple-gcc-4.2
     101    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     102    configure.cxx ${prefix}/bin/g++-apple-4.2
    109103}
    110104
  • trunk/dports/multimedia/ffmpeg/Portfile

    r87501 r89315  
    8989#
    9090# similarly clang fails to build on i386 platforms
    91 #
    92 # use code provided by jeremyhu here to use gcc-4.2 instead
    93 #
    94 # http://lists.macosforge.org/pipermail/macports-dev/2011-July/015263.html
    95 #
    96 
    97 if {${configure.compiler} == "clang" ||
    98     ${configure.compiler} == "llvm-gcc-4.2"} {
     91if {${configure.compiler} == "llvm-gcc-4.2"} {
    9992    configure.compiler gcc-4.2
    100     if {![file executable ${configure.cc}]} {
    101         depends_build-append port:apple-gcc42
    102         configure.compiler apple-gcc-4.2
    103     }
     93} elseif {${configure.compiler} == "clang"} {
     94    depends_build-append port:apple-gcc42
     95    configure.compiler apple-gcc-4.2
     96    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     97    configure.cxx ${prefix}/bin/g++-apple-4.2
    10498}
    10599
  • trunk/dports/net/unbound/Portfile

    r88240 r89315  
    3434
    3535if {[variant_isset universal]} {
    36     if {${configure.compiler} == "clang" ||
    37         ${configure.compiler} == "llvm-gcc-4.2"} {
     36    if {${configure.compiler} == "llvm-gcc-4.2"} {
    3837        configure.compiler gcc-4.2
    39         if {![file executable ${configure.cc}]} {
    40             depends_build-append port:apple-gcc42
    41             configure.compiler apple-gcc-4.2
    42             # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
    43             configure.cxx ${prefix}/bin/g++-apple-4.2
    44         }
     38    } elseif {${configure.compiler} == "clang"} {
     39        depends_build-append port:apple-gcc42
     40        configure.compiler apple-gcc-4.2
     41        # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     42        configure.cxx ${prefix}/bin/g++-apple-4.2
    4543    }
    4644}
  • trunk/dports/security/pwman/Portfile

    r87073 r89315  
    2929configure.args  --mandir=${prefix}/share/man
    3030
    31 if {${configure.compiler} == "clang" ||
    32     ${configure.compiler} == "llvm-gcc-4.2"} {
     31if {${configure.compiler} == "llvm-gcc-4.2"} {
    3332    configure.compiler gcc-4.2
    34     if {![file executable ${configure.cc}]} {
    35         depends_build-append port:apple-gcc42
    36         configure.compiler apple-gcc-4.2
    37         # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
    38         configure.cxx ${prefix}/bin/g++-apple-4.2
    39     }
     33} elseif {${configure.compiler} == "clang"} {
     34    depends_build-append port:apple-gcc42
     35    configure.compiler apple-gcc-4.2
     36    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     37    configure.cxx ${prefix}/bin/g++-apple-4.2
    4038}
    4139
  • trunk/dports/x11/wine-crossover-games/Portfile

    r85594 r89315  
    151151# llvm-gcc does not respect force_align_arg_pointer
    152152# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
    153 if {${configure.compiler} == "llvm-gcc-4.2" ||
    154     ${configure.compiler} == "clang"} {
     153if {${configure.compiler} == "llvm-gcc-4.2"} {
    155154    configure.compiler gcc-4.2
    156     if {![file executable ${configure.cc}]} {
    157         depends_build-append port:apple-gcc42
    158         configure.compiler apple-gcc-4.2
    159     }
     155} elseif {${configure.compiler} == "clang"} {
     156    depends_build-append port:apple-gcc42
     157    configure.compiler apple-gcc-4.2
     158    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     159    configure.cxx ${prefix}/bin/g++-apple-4.2
    160160}
    161161
  • trunk/dports/x11/wine-crossover/Portfile

    r85594 r89315  
    149149# llvm-gcc does not respect force_align_arg_pointer
    150150# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
    151 if {${configure.compiler} == "llvm-gcc-4.2" ||
    152     ${configure.compiler} == "clang"} {
     151if {${configure.compiler} == "llvm-gcc-4.2"} {
    153152    configure.compiler gcc-4.2
    154     if {![file executable ${configure.cc}]} {
    155         depends_build-append port:apple-gcc42
    156         configure.compiler apple-gcc-4.2
    157     }
     153} elseif {${configure.compiler} == "clang"} {
     154    depends_build-append port:apple-gcc42
     155    configure.compiler apple-gcc-4.2
     156    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     157    configure.cxx ${prefix}/bin/g++-apple-4.2
    158158}
    159159
  • trunk/dports/x11/wine-devel/Portfile

    r88886 r89315  
    148148# llvm-gcc does not respect force_align_arg_pointer
    149149# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
    150 if {${configure.compiler} == "llvm-gcc-4.2" ||
    151     ${configure.compiler} == "clang"} {
     150if {${configure.compiler} == "llvm-gcc-4.2"} {
    152151    configure.compiler gcc-4.2
    153     if {![file executable ${configure.cc}]} {
    154         depends_build-append port:apple-gcc42
    155         configure.compiler apple-gcc-4.2
    156     }
     152} elseif {${configure.compiler} == "clang"} {
     153    depends_build-append port:apple-gcc42
     154    configure.compiler apple-gcc-4.2
     155    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     156    configure.cxx ${prefix}/bin/g++-apple-4.2
    157157}
    158158
  • trunk/dports/x11/wine/Portfile

    r85594 r89315  
    149149# llvm-gcc does not respect force_align_arg_pointer
    150150# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
    151 if {${configure.compiler} == "llvm-gcc-4.2" ||
    152     ${configure.compiler} == "clang"} {
     151if {${configure.compiler} == "llvm-gcc-4.2"} {
    153152    configure.compiler gcc-4.2
    154     if {![file executable ${configure.cc}]} {
    155         depends_build-append port:apple-gcc42
    156         configure.compiler apple-gcc-4.2
    157     }
     153} elseif {${configure.compiler} == "clang"} {
     154    depends_build-append port:apple-gcc42
     155    configure.compiler apple-gcc-4.2
     156    # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
     157    configure.cxx ${prefix}/bin/g++-apple-4.2
    158158}
    159159
Note: See TracChangeset for help on using the changeset viewer.