Changeset 102174


Ignore:
Timestamp:
Jan 29, 2013, 7:53:39 AM (7 years ago)
Author:
jeremyhu@…
Message:

misc: Update compiler dependency workaround for #32542, see #37817

Location:
trunk/dports
Files:
29 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/ld64/Portfile

    r102082 r102174  
    114114
    115115# TODO: base should do this: http://trac.macports.org/ticket/32542
    116 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     116if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    117117    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    118     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     118
     119    # base 2.1.x ignores the argument and just use ${configure.compiler}
     120    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     121        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     122    }
     123
     124    if {[string match macports-gcc* ${configure.compiler}]} {
     125        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     126    }
    119127}
    120128
  • trunk/dports/devel/ppl/Portfile

    r102079 r102174  
    4242
    4343# TODO: base should do this: http://trac.macports.org/ticket/32542
    44 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     44if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    4545    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    46     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     46
     47    # base 2.1.x ignores the argument and just use ${configure.compiler}
     48    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     49        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     50    }
     51
     52    if {[string match macports-gcc* ${configure.compiler}]} {
     53        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     54    }
    4755}
    4856
  • trunk/dports/devel/smake/Portfile

    r102126 r102174  
    2929
    3030# TODO: base should do this: http://trac.macports.org/ticket/32542
    31 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     31if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    3232    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    33     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     33
     34    # base 2.1.x ignores the argument and just use ${configure.compiler}
     35    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     36        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     37    }
     38
     39    if {[string match macports-gcc* ${configure.compiler}]} {
     40        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     41    }
    3442}
    3543
  • trunk/dports/gis/cgal/Portfile

    r102134 r102174  
    5555
    5656# TODO: base should do this: http://trac.macports.org/ticket/32542
    57 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     57if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    5858    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    59     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     59
     60    # base 2.1.x ignores the argument and just use ${configure.compiler}
     61    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     62        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     63    }
     64
     65    if {[string match macports-gcc* ${configure.compiler}]} {
     66        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     67    }
    6068}
    6169
  • trunk/dports/graphics/opencv/Portfile

    r102100 r102174  
    110110compiler.blacklist-append       {clang < 318}
    111111
    112 # TODO: base should do this: http://trac.macports.org/ticket/32542
    113 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
    114     depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    115     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     112# TODO: base should do this: http://trac.macports.org/ticket/32542
     113if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
     114    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
     115
     116    # base 2.1.x ignores the argument and just use ${configure.compiler}
     117    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     118        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     119    }
     120
     121    if {[string match macports-gcc* ${configure.compiler}]} {
     122        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     123    }
    116124}
    117125
  • trunk/dports/lang/dragonegg-3.0/Portfile

    r102104 r102174  
    6565
    6666# TODO: base should do this: http://trac.macports.org/ticket/32542
    67 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
    68     depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
    69     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
     67if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
     68    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
     69
     70    # base 2.1.x ignores the argument and just use ${configure.compiler}
     71    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     72        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     73    }
     74
     75    if {[string match macports-gcc* ${configure.compiler}]} {
     76        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     77    }
    7078}
    7179
  • trunk/dports/lang/dragonegg-3.1/Portfile

    r102104 r102174  
    6363
    6464# TODO: base should do this: http://trac.macports.org/ticket/32542
    65 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
    66     depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
    67     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
     65if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
     66    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
     67
     68    # base 2.1.x ignores the argument and just use ${configure.compiler}
     69    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     70        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     71    }
     72
     73    if {[string match macports-gcc* ${configure.compiler}]} {
     74        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     75    }
    6876}
    6977
  • trunk/dports/lang/dragonegg-3.2/Portfile

    r102104 r102174  
    6262
    6363# TODO: base should do this: http://trac.macports.org/ticket/32542
    64 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
    65     depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
    66     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
     64if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
     65    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
     66
     67    # base 2.1.x ignores the argument and just use ${configure.compiler}
     68    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     69        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     70    }
     71
     72    if {[string match macports-gcc* ${configure.compiler}]} {
     73        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     74    }
    6775}
    6876
  • trunk/dports/lang/dragonegg-3.3/Portfile

    r102104 r102174  
    6262
    6363# TODO: base should do this: http://trac.macports.org/ticket/32542
    64 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
    65     depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
    66     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
     64if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
     65    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
     66
     67    # base 2.1.x ignores the argument and just use ${configure.compiler}
     68    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     69        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     70    }
     71
     72    if {[string match macports-gcc* ${configure.compiler}]} {
     73        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     74    }
    6775}
    6876
  • trunk/dports/lang/gcc43/Portfile

    r102108 r102174  
    121121
    122122# TODO: base should do this: http://trac.macports.org/ticket/32542
    123 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     123if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    124124    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    125     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     125
     126    # base 2.1.x ignores the argument and just use ${configure.compiler}
     127    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     128        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     129    }
     130
     131    if {[string match macports-gcc* ${configure.compiler}]} {
     132        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     133    }
    126134}
    127135
  • trunk/dports/lang/gcc44/Portfile

    r102108 r102174  
    122122
    123123# TODO: base should do this: http://trac.macports.org/ticket/32542
    124 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     124if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    125125    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    126     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     126
     127    # base 2.1.x ignores the argument and just use ${configure.compiler}
     128    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     129        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     130    }
     131
     132    if {[string match macports-gcc* ${configure.compiler}]} {
     133        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     134    }
    127135}
    128136
  • trunk/dports/lang/gcc45/Portfile

    r102108 r102174  
    130130
    131131# TODO: base should do this: http://trac.macports.org/ticket/32542
    132 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     132if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    133133    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    134     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     134
     135    # base 2.1.x ignores the argument and just use ${configure.compiler}
     136    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     137        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     138    }
     139
     140    if {[string match macports-gcc* ${configure.compiler}]} {
     141        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     142    }
    135143}
    136144
  • trunk/dports/lang/gcc46/Portfile

    r102108 r102174  
    125125
    126126# TODO: base should do this: http://trac.macports.org/ticket/32542
    127 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     127if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    128128    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    129     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     129
     130    # base 2.1.x ignores the argument and just use ${configure.compiler}
     131    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     132        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     133    }
     134
     135    if {[string match macports-gcc* ${configure.compiler}]} {
     136        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     137    }
    130138}
    131139
  • trunk/dports/lang/gcc47/Portfile

    r102108 r102174  
    123123
    124124# TODO: base should do this: http://trac.macports.org/ticket/32542
    125 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     125if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    126126    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    127     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     127
     128    # base 2.1.x ignores the argument and just use ${configure.compiler}
     129    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     130        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     131    }
     132
     133    if {[string match macports-gcc* ${configure.compiler}]} {
     134        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     135    }
    128136}
    129137
  • trunk/dports/lang/gcc48/Portfile

    r102108 r102174  
    107107
    108108# TODO: base should do this: http://trac.macports.org/ticket/32542
    109 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     109if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    110110    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    111     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     111
     112    # base 2.1.x ignores the argument and just use ${configure.compiler}
     113    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     114        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     115    }
     116
     117    if {[string match macports-gcc* ${configure.compiler}]} {
     118        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     119    }
    112120}
    113121
  • trunk/dports/lang/llvm-2.9/Portfile

    r102101 r102174  
    120120
    121121# TODO: base should do this: http://trac.macports.org/ticket/32542
    122 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
    123     depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
    124     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
     122if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
     123    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
     124
     125    # base 2.1.x ignores the argument and just use ${configure.compiler}
     126    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     127        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     128    }
     129
     130    if {[string match macports-gcc* ${configure.compiler}]} {
     131        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     132    }
    125133}
    126134
  • trunk/dports/lang/llvm-3.0/Portfile

    r102101 r102174  
    119119
    120120# TODO: base should do this: http://trac.macports.org/ticket/32542
    121 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
    122     depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
    123     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
     121if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
     122    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
     123
     124    # base 2.1.x ignores the argument and just use ${configure.compiler}
     125    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     126        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     127    }
     128
     129    if {[string match macports-gcc* ${configure.compiler}]} {
     130        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     131    }
    124132}
    125133
  • trunk/dports/lang/llvm-3.1/Portfile

    r102101 r102174  
    123123
    124124# TODO: base should do this: http://trac.macports.org/ticket/32542
    125 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
    126     depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
    127     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
     125if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
     126    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
     127
     128    # base 2.1.x ignores the argument and just use ${configure.compiler}
     129    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     130        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     131    }
     132
     133    if {[string match macports-gcc* ${configure.compiler}]} {
     134        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     135    }
    128136}
    129137
  • trunk/dports/lang/llvm-3.2/Portfile

    r102101 r102174  
    123123
    124124# TODO: base should do this: http://trac.macports.org/ticket/32542
    125 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
    126     depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
    127     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
     125if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
     126    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
     127
     128    # base 2.1.x ignores the argument and just use ${configure.compiler}
     129    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     130        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     131    }
     132
     133    if {[string match macports-gcc* ${configure.compiler}]} {
     134        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     135    }
    128136}
    129137
  • trunk/dports/lang/llvm-3.3/Portfile

    r102101 r102174  
    111111
    112112# TODO: base should do this: http://trac.macports.org/ticket/32542
    113 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
    114     depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler}) port:ld64 port:cctools
    115     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler}) ld64 cctools
     113if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
     114    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
     115
     116    # base 2.1.x ignores the argument and just use ${configure.compiler}
     117    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     118        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     119    }
     120
     121    if {[string match macports-gcc* ${configure.compiler}]} {
     122        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     123    }
    116124}
    117125
  • trunk/dports/lang/ruby/Portfile

    r102104 r102174  
    7676
    7777# TODO: base should do this: http://trac.macports.org/ticket/32542
    78 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     78if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    7979    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    80     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     80
     81    # base 2.1.x ignores the argument and just use ${configure.compiler}
     82    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     83        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     84    }
     85
     86    if {[string match macports-gcc* ${configure.compiler}]} {
     87        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     88    }
    8189}
    8290
  • trunk/dports/multimedia/MPlayer/Portfile

    r102151 r102174  
    268268
    269269# TODO: base should do this: http://trac.macports.org/ticket/32542
    270 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     270if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    271271    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    272     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     272
     273    # base 2.1.x ignores the argument and just use ${configure.compiler}
     274    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     275        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     276    }
     277
     278    if {[string match macports-gcc* ${configure.compiler}]} {
     279        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     280    }
    273281}
    274282
  • trunk/dports/multimedia/VLC-devel/Portfile

    r102113 r102174  
    103103
    104104# TODO: base should do this: http://trac.macports.org/ticket/32542
    105 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     105if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    106106    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    107     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     107
     108    # base 2.1.x ignores the argument and just use ${configure.compiler}
     109    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     110        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     111    }
     112
     113    if {[string match macports-gcc* ${configure.compiler}]} {
     114        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     115    }
    108116}
    109117
  • trunk/dports/multimedia/VLC/Portfile

    r102113 r102174  
    9595
    9696# TODO: base should do this: http://trac.macports.org/ticket/32542
    97 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     97if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    9898    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    99     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     99
     100    # base 2.1.x ignores the argument and just use ${configure.compiler}
     101    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     102        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     103    }
     104
     105    if {[string match macports-gcc* ${configure.compiler}]} {
     106        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     107    }
    100108}
    101109
  • trunk/dports/multimedia/ffmpeg-devel/Portfile

    r102090 r102174  
    9898
    9999# TODO: base should do this: http://trac.macports.org/ticket/32542
    100 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     100if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    101101    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    102     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     102
     103    # base 2.1.x ignores the argument and just use ${configure.compiler}
     104    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     105        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     106    }
     107
     108    if {[string match macports-gcc* ${configure.compiler}]} {
     109        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     110    }
    103111}
    104112
  • trunk/dports/multimedia/ffmpeg/Portfile

    r102088 r102174  
    9595
    9696# TODO: base should do this: http://trac.macports.org/ticket/32542
    97 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     97if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    9898    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    99     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     99
     100    # base 2.1.x ignores the argument and just use ${configure.compiler}
     101    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     102        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     103    }
     104
     105    if {[string match macports-gcc* ${configure.compiler}]} {
     106        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     107    }
    100108}
    101109
  • trunk/dports/multimedia/mplayer-devel/Portfile

    r102161 r102174  
    279279
    280280# TODO: base should do this: http://trac.macports.org/ticket/32542
    281 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     281if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    282282    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    283     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     283
     284    # base 2.1.x ignores the argument and just use ${configure.compiler}
     285    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     286        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     287    }
     288
     289    if {[string match macports-gcc* ${configure.compiler}]} {
     290        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     291    }
    284292}
    285293
  • trunk/dports/multimedia/mythtv-core.25/Portfile

    r102157 r102174  
    9393
    9494# TODO: base should do this: http://trac.macports.org/ticket/32542
    95 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     95if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    9696    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    9797
  • trunk/dports/x11/xorg-xcb-util/Portfile

    r102109 r102174  
    2828
    2929# TODO: base should do this: http://trac.macports.org/ticket/32542
    30 if {[portconfigure::compiler_is_port ${configure.compiler}]} {
     30if {[info exists portconfigure::compiler_name_map(${configure.compiler})]} {
    3131    depends_build-append port:$portconfigure::compiler_name_map(${configure.compiler})
    32     depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     32
     33    # base 2.1.x ignores the argument and just use ${configure.compiler}
     34    if {[portconfigure::arch_flag_supported ${configure.compiler}]} {
     35        depends_skip_archcheck-append $portconfigure::compiler_name_map(${configure.compiler})
     36    }
     37
     38    if {[string match macports-gcc* ${configure.compiler}]} {
     39        depends_lib-append port:$portconfigure::compiler_name_map(${configure.compiler})
     40    }
    3341}
    3442
Note: See TracChangeset for help on using the changeset viewer.