Changeset 121269


Ignore:
Timestamp:
Jun 21, 2014, 8:18:42 PM (6 years ago)
Author:
jeremyhu@…
Message:

misc: Cleanup configure.cxx_stdlib related logic now that we can assume base 2.3 or newer

Location:
trunk/dports
Files:
78 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/qt4-mac/Portfile

    r119772 r121269  
    579579    configure.env-append PKG_CONFIG=${prefix}/bin/pkg-config
    580580
    581     # set which stdlib to use; clang only; use configure.cxx_stdlib if
    582     # that exists, and otherwise use libc++ on 10.9 or libstdc++ on
    583     # 10.8 or earler.
    584 
     581    # set which stdlib to use; clang only
    585582    if {[string match *clang* ${configure.compiler}]} {
    586         if {[info exists configure.cxx_stdlib]} {
    587             configure.env-append QMAKE_STDLIB="-stdlib=${configure.cxx_stdlib}"
    588         } elseif {${MINOR} == 9} {
    589             configure.env-append QMAKE_STDLIB="-stdlib=libc++"
    590         } else {
    591             configure.env-append QMAKE_STDLIB="-stdlib=libstdc++"
    592         }
     583        configure.env-append QMAKE_STDLIB="-stdlib=${configure.cxx_stdlib}"
    593584    }
    594585}
  • trunk/dports/archivers/unrar/Portfile

    r115367 r121269  
    3939}
    4040
    41 # TODO: Simplify once MacPorts 2.3 is released
    4241set cxx_stdlibflags {}
    43 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     42if {[string match *clang* ${configure.cxx}]} {
    4443    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    4544}
  • trunk/dports/audio/faac/Portfile

    r115368 r121269  
    2424patchfiles          patch-configure.in.diff
    2525
    26 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    27 platform darwin {
    28     set cxxstdlib {}
    29 
    30     if {[info exists configure.cxx_stdlib] &&
    31         ${configure.cxx_stdlib} ne {} &&
    32         [string match *clang* ${configure.cxx}]} {
    33         set cxxstdlib ${configure.cxx_stdlib}
    34     } elseif {[string match *clang* ${configure.cxx}] &&
    35               ${os.major} >= 13} {
    36         set cxxstdlib libc++
    37     } else {
    38         set cxxstdlib libstdc++
    39     }
    40 
    41     post-patch {
    42         if {${cxxstdlib} == "libc++"} {
    43             reinplace "s:-lstdc\+\+:-lc++:" \
    44                 ${worksrcpath}/frontend/Makefile.am \
    45                 ${worksrcpath}/frontend/Makefile.in
    46         }
     26post-patch {
     27     if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
     28        reinplace "s:-lstdc\+\+:-lc++:" \
     29            ${worksrcpath}/frontend/Makefile.am \
     30            ${worksrcpath}/frontend/Makefile.in
    4731    }
    4832}
  • trunk/dports/audio/id3v2/Portfile

    r115366 r121269  
    3131}
    3232
    33 # TODO: Simplify once MacPorts 2.3 is released
    3433set cxx_stdlibflags {}
    35 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     34if {[string match *clang* ${configure.cxx}]} {
    3635    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    3736}
  • trunk/dports/cross/arm-elf-gcc/Portfile

    r117720 r121269  
    183183
    184184# the bootstrap compiler doesn't accept -stdlib
    185 if {[info exists configure.cxx_stdlib]} {
    186     configure.cxx_stdlib
    187 }
     185configure.cxx_stdlib
    188186
    189187build.dir       ${workpath}/build
  • trunk/dports/databases/db44/Portfile

    r115389 r121269  
    6060                --libdir=\\\${prefix}/lib/db${branch}
    6161
    62 # TODO: Simplify once MacPorts 2.3 is released
    6362set cxx_stdlibflags {}
    64 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     63if {[string match *clang* ${configure.cxx}]} {
    6564    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    6665}
  • trunk/dports/databases/db46/Portfile

    r121187 r121269  
    7373                --enable-dump185
    7474
    75 # TODO: Simplify once MacPorts 2.3 is released
    7675set cxx_stdlibflags {}
    77 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     76if {[string match *clang* ${configure.cxx}]} {
    7877    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    7978}
  • trunk/dports/databases/db47/Portfile

    r115389 r121269  
    6161                --libdir=\\\${prefix}/lib/db${branch}
    6262
    63 # TODO: Simplify once MacPorts 2.3 is released
    6463set cxx_stdlibflags {}
    65 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     64if {[string match *clang* ${configure.cxx}]} {
    6665    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    6766}
  • trunk/dports/databases/db48/Portfile

    r115389 r121269  
    4141                --libdir=\\\${prefix}/lib/db${branch}
    4242
    43 # TODO: Simplify once MacPorts 2.3 is released
    4443set cxx_stdlibflags {}
    45 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     44if {[string match *clang* ${configure.cxx}]} {
    4645    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    4746}
  • trunk/dports/databases/db51/Portfile

    r115389 r121269  
    4040                --libdir=\\\${prefix}/lib/db${branch}
    4141
    42 # TODO: Simplify once MacPorts 2.3 is released
    4342set cxx_stdlibflags {}
    44 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     43if {[string match *clang* ${configure.cxx}]} {
    4544    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    4645}
  • trunk/dports/databases/db52/Portfile

    r115389 r121269  
    4040                --libdir=\\\${prefix}/lib/db${branch}
    4141
    42 # TODO: Simplify once MacPorts 2.3 is released
    4342set cxx_stdlibflags {}
    44 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     43if {[string match *clang* ${configure.cxx}]} {
    4544    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    4645}
  • trunk/dports/databases/db53/Portfile

    r115389 r121269  
    4040                --libdir=\\\${prefix}/lib/db${branch}
    4141
    42 # TODO: Simplify once MacPorts 2.3 is released
    4342set cxx_stdlibflags {}
    44 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     43if {[string match *clang* ${configure.cxx}]} {
    4544    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    4645}
  • trunk/dports/devel/boost/Portfile

    r120998 r121269  
    131131
    132132    set cxx_stdlibflags {}
    133     if {[info exists configure.cxx_stdlib] &&
    134         ${configure.cxx_stdlib} ne {} &&
    135         [string match *clang* ${configure.cxx}]} {
     133    if {[string match *clang* ${configure.cxx}]} {
    136134        set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    137135    }
  • trunk/dports/devel/cctools/Portfile

    r120183 r121269  
    130130
    131131set cxx_stdlibflags {}
    132 if {[info exists configure.cxx_stdlib] &&
    133     ${configure.cxx_stdlib} ne {} &&
    134     [string match *clang* ${configure.cxx}]} {
     132if {[string match *clang* ${configure.cxx}]} {
    135133    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    136134}
  • trunk/dports/devel/gmp/Portfile

    r118841 r121269  
    5353# On PowerPC machines, CFLAGS must be empty to get -force_cpusubtype_ALL.
    5454
    55 if {[info exists configure.cxx_stdlib] &&
    56     ${configure.cxx_stdlib} ne {} &&
    57     [string match *clang* ${configure.cxx}]
    58 } then {
     55set cxx_stdlibflags {}
     56if {[string match *clang* ${configure.cxx}]} {
    5957    configure.cxx-append -stdlib=${configure.cxx_stdlib}
    6058    configure.cxx_stdlib
  • trunk/dports/devel/ld64/Portfile

    r120606 r121269  
    8383set makefile "Makefile-133"
    8484
    85 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    8685set cxx_stdlibflags {}
    87 platform darwin {
    88     set cxxstdlib {}
    89 
    90     if {[info exists configure.cxx_stdlib] &&
    91         ${configure.cxx_stdlib} ne {} &&
    92         [string match *clang* ${configure.cxx}]} {
    93         set cxxstdlib ${configure.cxx_stdlib}
    94     } elseif {[string match *clang* ${configure.cxx}] &&
    95               ${os.major} >= 13} {
    96         set cxxstdlib libc++
    97     } else {
    98         set cxxstdlib libstdc++
    99     }
    100 
    101     if {[string match *clang* ${configure.cxx}]} {
    102         set cxx_stdlibflags -stdlib=${cxxstdlib}
    103     }
     86if {[string match *clang* ${configure.cxx}]} {
     87    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    10488}
    10589
     
    146130    compiler.blacklist-append *gcc*
    147131
    148     if {${cxxstdlib} eq "libstdc++"} {
     132    if {${configure.cxx_stdlib} eq "libstdc++"} {
    149133        patchfiles-append   ld64-236-hash_set.patch
    150134    }
  • trunk/dports/devel/webkit-sharp/Portfile

    r115137 r121269  
    3030universal_variant   no
    3131
    32 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    3332platform darwin {
    34     set cxxstdlib {}
    35 
    36     if {[info exists configure.cxx_stdlib] &&
    37         ${configure.cxx_stdlib} ne {} &&
    38         [string match *clang* ${configure.cxx}]} {
    39         set cxxstdlib ${configure.cxx_stdlib}
    40     } elseif {[string match *clang* ${configure.cxx}] &&
    41               ${os.major} >= 13} {
    42         set cxxstdlib libc++
    43     } else {
    44         set cxxstdlib libstdc++
    45     }
    46 
    47     if {${cxxstdlib} eq "libstdc++"} {
     33    if {${configure.cxx_stdlib} eq "libstdc++"} {
    4834       depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
    4935       depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
  • trunk/dports/gnome/balsa/Portfile

    r115644 r121269  
    6969configure.cflags-append -D_DARWIN_C_SOURCE
    7070
    71 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    7271platform darwin {
    73     set cxxstdlib {}
    74 
    75     if {[info exists configure.cxx_stdlib] &&
    76         ${configure.cxx_stdlib} ne {} &&
    77         [string match *clang* ${configure.cxx}]} {
    78         set cxxstdlib ${configure.cxx_stdlib}
    79     } elseif {[string match *clang* ${configure.cxx}] &&
    80               ${os.major} >= 13} {
    81         set cxxstdlib libc++
    82     } else {
    83         set cxxstdlib libstdc++
    84     }
    85 
    86     if {${cxxstdlib} eq "libstdc++"} {
     72    if {${configure.cxx_stdlib} eq "libstdc++"} {
    8773       depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
    8874       depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
  • trunk/dports/gnome/devhelp/Portfile

    r118838 r121269  
    3939                path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
    4040
    41 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    4241platform darwin {
    43     set cxxstdlib {}
    44 
    45     if {[info exists configure.cxx_stdlib] &&
    46         ${configure.cxx_stdlib} ne {} &&
    47         [string match *clang* ${configure.cxx}]} {
    48         set cxxstdlib ${configure.cxx_stdlib}
    49     } elseif {[string match *clang* ${configure.cxx}] &&
    50               ${os.major} >= 13} {
    51         set cxxstdlib libc++
    52     } else {
    53         set cxxstdlib libstdc++
    54     }
    55 
    56     if {${cxxstdlib} eq "libstdc++"} {
     42    if {${configure.cxx_stdlib} eq "libstdc++"} {
    5743       depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
    5844       depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
  • trunk/dports/gnome/empathy/Portfile

    r120927 r121269  
    7070                port:yelp
    7171
    72 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    7372platform darwin {
    74     set cxxstdlib {}
    75 
    76     if {[info exists configure.cxx_stdlib] &&
    77         ${configure.cxx_stdlib} ne {} &&
    78         [string match *clang* ${configure.cxx}]} {
    79         set cxxstdlib ${configure.cxx_stdlib}
    80     } elseif {[string match *clang* ${configure.cxx}] &&
    81               ${os.major} >= 13} {
    82         set cxxstdlib libc++
    83     } else {
    84         set cxxstdlib libstdc++
    85     }
    86 
    87     if {${cxxstdlib} eq "libstdc++"} {
     73    if {${configure.cxx_stdlib} eq "libstdc++"} {
    8874       depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
    8975       depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
  • trunk/dports/gnome/gnome-online-accounts/Portfile

    r120766 r121269  
    121121}
    122122
    123 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    124123platform darwin {
    125     set cxxstdlib {}
    126 
    127     if {[info exists configure.cxx_stdlib] &&
    128         ${configure.cxx_stdlib} ne {} &&
    129         [string match *clang* ${configure.cxx}]} {
    130         set cxxstdlib ${configure.cxx_stdlib}
    131     } elseif {[string match *clang* ${configure.cxx}] &&
    132               ${os.major} >= 13} {
    133         set cxxstdlib libc++
    134     } else {
    135         set cxxstdlib libstdc++
    136     }
    137 
    138     if {${cxxstdlib} eq "libstdc++"} {
     124    if {${configure.cxx_stdlib} eq "libstdc++"} {
    139125       depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
    140126       depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
  • trunk/dports/gnome/gnucash-devel/Portfile

    r120845 r121269  
    6262                  port:p5.12-finance-quote   
    6363
    64 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    6564platform darwin {
    66     set cxxstdlib {}
    67 
    68     if {[info exists configure.cxx_stdlib] &&
    69         ${configure.cxx_stdlib} ne {} &&
    70         [string match *clang* ${configure.cxx}]} {
    71         set cxxstdlib ${configure.cxx_stdlib}
    72     } elseif {[string match *clang* ${configure.cxx}] &&
    73               ${os.major} >= 13} {
    74         set cxxstdlib libc++
    75     } else {
    76         set cxxstdlib libstdc++
    77     }
    78 
    79     if {${cxxstdlib} eq "libstdc++"} {
     65    if {${configure.cxx_stdlib} eq "libstdc++"} {
    8066       depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
    8167       depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
  • trunk/dports/gnome/gnucash/Portfile

    r121044 r121269  
    5757}
    5858
    59 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    6059platform darwin {
    61     set cxxstdlib {}
    62 
    63     if {[info exists configure.cxx_stdlib] &&
    64         ${configure.cxx_stdlib} ne {} &&
    65         [string match *clang* ${configure.cxx}]} {
    66         set cxxstdlib ${configure.cxx_stdlib}
    67     } elseif {[string match *clang* ${configure.cxx}] &&
    68               ${os.major} >= 13} {
    69         set cxxstdlib libc++
    70     } else {
    71         set cxxstdlib libstdc++
    72     }
    73 
    74     if {${cxxstdlib} eq "libstdc++"} {
     60    if {${configure.cxx_stdlib} eq "libstdc++"} {
    7561       depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
    7662       depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
  • trunk/dports/gnome/liferea/Portfile

    r115137 r121269  
    3535                    port:libglade2
    3636
    37 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    3837platform darwin {
    39     set cxxstdlib {}
    40 
    41     if {[info exists configure.cxx_stdlib] &&
    42         ${configure.cxx_stdlib} ne {} &&
    43         [string match *clang* ${configure.cxx}]} {
    44         set cxxstdlib ${configure.cxx_stdlib}
    45     } elseif {[string match *clang* ${configure.cxx}] &&
    46               ${os.major} >= 13} {
    47         set cxxstdlib libc++
    48     } else {
    49         set cxxstdlib libstdc++
    50     }
    51 
    52     if {${cxxstdlib} eq "libstdc++"} {
     38    if {${configure.cxx_stdlib} eq "libstdc++"} {
    5339       depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
    5440       depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
  • trunk/dports/gnome/seed/Portfile

    r117425 r121269  
    4545configure.args  --disable-gettext-module
    4646
    47 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    4847platform darwin {
    49     set cxxstdlib {}
    50 
    51     if {[info exists configure.cxx_stdlib] &&
    52         ${configure.cxx_stdlib} ne {} &&
    53         [string match *clang* ${configure.cxx}]} {
    54         set cxxstdlib ${configure.cxx_stdlib}
    55     } elseif {[string match *clang* ${configure.cxx}] &&
    56               ${os.major} >= 13} {
    57         set cxxstdlib libc++
    58     } else {
    59         set cxxstdlib libstdc++
    60     }
    61 
    62     if {${cxxstdlib} eq "libstdc++"} {
     48    if {${configure.cxx_stdlib} eq "libstdc++"} {
    6349       depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
    6450       depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
  • trunk/dports/gnome/yelp/Portfile

    r118883 r121269  
    6868}
    6969
    70 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    7170platform darwin {
    72     set cxxstdlib {}
    73 
    74     if {[info exists configure.cxx_stdlib] &&
    75         ${configure.cxx_stdlib} ne {} &&
    76         [string match *clang* ${configure.cxx}]} {
    77         set cxxstdlib ${configure.cxx_stdlib}
    78     } elseif {[string match *clang* ${configure.cxx}] &&
    79               ${os.major} >= 13} {
    80         set cxxstdlib libc++
    81     } else {
    82         set cxxstdlib libstdc++
    83     }
    84 
    85     if {${cxxstdlib} eq "libstdc++"} {
     71    if {${configure.cxx_stdlib} eq "libstdc++"} {
    8672       depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
    8773       depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
  • trunk/dports/gnome/zenity/Portfile

    r119484 r121269  
    4444configure.args  --disable-silent-rules
    4545
    46 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    4746platform darwin {
    48     set cxxstdlib {}
    49 
    50     if {[info exists configure.cxx_stdlib] &&
    51         ${configure.cxx_stdlib} ne {} &&
    52         [string match *clang* ${configure.cxx}]} {
    53         set cxxstdlib ${configure.cxx_stdlib}
    54     } elseif {[string match *clang* ${configure.cxx}] &&
    55               ${os.major} >= 13} {
    56         set cxxstdlib libc++
    57     } else {
    58         set cxxstdlib libstdc++
    59     }
    60 
    61     if {${cxxstdlib} eq "libstdc++"} {
     47    if {${configure.cxx_stdlib} eq "libstdc++"} {
    6248       depends_lib-delete path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3
    6349       depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
  • trunk/dports/graphics/birdfont/Portfile

    r115137 r121269  
    5959}
    6060
    61 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    6261platform darwin {
    63     set cxxstdlib {}
    64 
    65     if {[info exists configure.cxx_stdlib] &&
    66         ${configure.cxx_stdlib} ne {} &&
    67         [string match *clang* ${configure.cxx}]} {
    68         set cxxstdlib ${configure.cxx_stdlib}
    69     } elseif {[string match *clang* ${configure.cxx}] &&
    70               ${os.major} >= 13} {
    71         set cxxstdlib libc++
    72     } else {
    73         set cxxstdlib libstdc++
    74     }
    75 
    76     if {${cxxstdlib} eq "libstdc++"} {
     62    if {${configure.cxx_stdlib} eq "libstdc++"} {
    7763       depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
    7864       depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
  • trunk/dports/graphics/freeimage/Portfile

    r119199 r121269  
    7272
    7373# Reimplement parts of portconfigure.tcl
    74 if {[info exists configure.cxx_stdlib] &&
    75     ${configure.cxx_stdlib} ne {} &&
    76     [string match *clang* ${configure.cxx}]
    77 } then {
     74if {[string match *clang* ${configure.cxx}]} {
    7875    configure.cxxflags-append -stdlib=${configure.cxx_stdlib}
    7976    configure.ldflags-append  -stdlib=${configure.cxx_stdlib}
  • trunk/dports/graphics/gimp2-devel/Portfile

    r119630 r121269  
    7474depends_run     path:share/gimp/2.0/help:gimp-help-en
    7575
    76 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    77 platform darwin {
    78     set cxxstdlib {}
    79 
    80     if {[info exists configure.cxx_stdlib] &&
    81         ${configure.cxx_stdlib} ne {} &&
    82         [string match *clang* ${configure.cxx}]} {
    83         set cxxstdlib ${configure.cxx_stdlib}
    84     } elseif {[string match *clang* ${configure.cxx}] &&
    85               ${os.major} >= 13} {
    86         set cxxstdlib libc++
    87     } else {
    88         set cxxstdlib libstdc++
    89     }
    90 }
    91 
    9276use_parallel_build no
    9377
     
    189173    configure.args-delete   --without-webkit
    190174
    191     if {${cxxstdlib} eq "libstdc++"} {
     175    if {${configure.cxx_stdlib} eq "libstdc++"} {
    192176            depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
    193177    } else {
  • trunk/dports/graphics/gimp2/Portfile

    r119058 r121269  
    7171depends_run     path:share/gimp/2.0/help:gimp-help-en
    7272
    73 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    74 platform darwin {
    75     set cxxstdlib {}
    76 
    77     if {[info exists configure.cxx_stdlib] &&
    78         ${configure.cxx_stdlib} ne {} &&
    79         [string match *clang* ${configure.cxx}]} {
    80         set cxxstdlib ${configure.cxx_stdlib}
    81     } elseif {[string match *clang* ${configure.cxx}] &&
    82               ${os.major} >= 13} {
    83         set cxxstdlib libc++
    84     } else {
    85         set cxxstdlib libstdc++
    86     }
    87 }
    88 
    8973patchfiles      patch-etc-gimprc.diff \
    9074                patch-freetype-includes.diff \
     
    223207    configure.args-delete   --without-webkit
    224208
    225     if {${cxxstdlib} eq "libstdc++"} {
     209    if {${configure.cxx_stdlib} eq "libstdc++"} {
    226210            depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
    227211    } else {
  • trunk/dports/graphics/gimp3-devel/Portfile

    r118869 r121269  
    7777use_parallel_build no
    7878
    79 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    80 platform darwin {
    81     set cxxstdlib {}
    82 
    83     if {[info exists configure.cxx_stdlib] &&
    84         ${configure.cxx_stdlib} ne {} &&
    85         [string match *clang* ${configure.cxx}]} {
    86         set cxxstdlib ${configure.cxx_stdlib}
    87     } elseif {[string match *clang* ${configure.cxx}] &&
    88               ${os.major} >= 13} {
    89         set cxxstdlib libc++
    90     } else {
    91         set cxxstdlib libstdc++
    92     }
    93 }
    94 
    9579patchfiles      patch-configure.ac.diff \
    9680                patch-etc-gimprc.diff \
     
    191175    configure.args-delete   --without-webkit
    192176
    193     if {${cxxstdlib} eq "libstdc++"} {
     177    if {${configure.cxx_stdlib} eq "libstdc++"} {
    194178            depends_lib-append path:lib/pkgconfig/webkitgtk-3.0.pc:webkit-gtk3-2.0
    195179    } else {
  • trunk/dports/graphics/graphviz-devel/Portfile

    r121035 r121269  
    117117
    118118    post-patch {
    119         set cxxstdlib {}
    120 
    121         if {[info exists configure.cxx_stdlib] &&
    122             ${configure.cxx_stdlib} ne {} &&
    123             [string match *clang* ${configure.cxx}]} {
    124             set cxxstdlib ${configure.cxx_stdlib}
    125         } elseif {[string match *clang* ${configure.cxx}] &&
    126                   ${os.major} >= 13} {
    127             set cxxstdlib libc++
    128         } else {
    129             set cxxstdlib libstdc++
    130         }
    131 
    132         if {${cxxstdlib} == "libc++"} {
     119        if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
    133120            reinplace "s:-lstdc\+\+:-lc++:" \
    134121                ${worksrcpath}/configure.ac \
  • trunk/dports/graphics/graphviz/Portfile

    r118986 r121269  
    117117
    118118    post-patch {
    119         set cxxstdlib {}
    120 
    121         if {[info exists configure.cxx_stdlib] &&
    122             ${configure.cxx_stdlib} ne {} &&
    123             [string match *clang* ${configure.cxx}]} {
    124             set cxxstdlib ${configure.cxx_stdlib}
    125         } elseif {[string match *clang* ${configure.cxx}] &&
    126                   ${os.major} >= 13} {
    127             set cxxstdlib libc++
    128         } else {
    129             set cxxstdlib libstdc++
    130         }
    131 
    132         if {${cxxstdlib} == "libc++"} {
     119        if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
    133120            reinplace "s:-lstdc\+\+:-lc++:" \
    134121                ${worksrcpath}/configure.ac \
  • trunk/dports/graphics/lensfun/Portfile

    r115379 r121269  
    4040}
    4141
    42 # TODO: Simplify once MacPorts 2.3 is released
    4342set cxx_stdlibflags {}
    44 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     43if {[string match *clang* ${configure.cxx}]} {
    4544    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    4645}
  • trunk/dports/graphics/makeicns/Portfile

    r115574 r121269  
    3535}
    3636
    37 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    38 platform darwin {
    39     set cxxstdlib {}
    40 
    41     if {[info exists configure.cxx_stdlib] &&
    42         ${configure.cxx_stdlib} ne {} &&
    43         [string match *clang* ${configure.cxx}]} {
    44         set cxxstdlib ${configure.cxx_stdlib}
    45     } elseif {[string match *clang* ${configure.cxx}] &&
    46               ${os.major} >= 13} {
    47         set cxxstdlib libc++
    48     } else {
    49         set cxxstdlib libstdc++
    50     }
    51 
    52     if {[string match *clang* ${configure.cxx}]} {
    53         configure.cxxflags-append -stdlib=${cxxstdlib}
    54         configure.ldflags-append -stdlib=${cxxstdlib}
    55     }
     37if {[string match *clang* ${configure.cxx}]} {
     38    configure.cxxflags-append -stdlib=${configure.cxx_stdlib}
     39    configure.ldflags-append  -stdlib=${configure.cxx_stdlib}
    5640}
    5741
  • trunk/dports/lang/dragonegg-3.0/Portfile

    r120597 r121269  
    119119
    120120set cxx_stdlibflags {}
    121 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     121if {[string match *clang* ${configure.cxx}]} {
    122122    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    123123}
  • trunk/dports/lang/dragonegg-3.1/Portfile

    r120597 r121269  
    125125
    126126set cxx_stdlibflags {}
    127 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     127if {[string match *clang* ${configure.cxx}]} {
    128128    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    129129}
  • trunk/dports/lang/dragonegg-3.2/Portfile

    r120597 r121269  
    125125
    126126set cxx_stdlibflags {}
    127 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     127if {[string match *clang* ${configure.cxx}]} {
    128128    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    129129}
  • trunk/dports/lang/dragonegg-3.3/Portfile

    r120597 r121269  
    119119
    120120set cxx_stdlibflags {}
    121 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     121if {[string match *clang* ${configure.cxx}]} {
    122122    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    123123}
  • trunk/dports/lang/dragonegg-3.4/Portfile

    r120597 r121269  
    120120
    121121set cxx_stdlibflags {}
    122 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     122if {[string match *clang* ${configure.cxx}]} {
    123123    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    124124}
  • trunk/dports/lang/gcc43/Portfile

    r110870 r121269  
    119119 
    120120# "-stdlib" would be passed on to the bootstrap compiler if present
    121 if {[info exists configure.cxx_stdlib]} {
    122     configure.cxx_stdlib
    123 }
     121configure.cxx_stdlib
    124122
    125123# STAGE1_CFLAGS="-O2 -fkeep-inline-functions" : from configure.ac
  • trunk/dports/lang/gcc44/Portfile

    r110870 r121269  
    120120 
    121121# "-stdlib" would be passed on to the bootstrap compiler if present
    122 if {[info exists configure.cxx_stdlib]} {
    123     configure.cxx_stdlib
    124 }
     122configure.cxx_stdlib
    125123
    126124# STAGE1_CFLAGS="-O2 -fkeep-inline-functions" : from configure.ac
  • trunk/dports/lang/gcc45/Portfile

    r116200 r121269  
    142142
    143143# "-stdlib" would be passed on to the bootstrap compiler if present
    144 if {[info exists configure.cxx_stdlib]} {
    145     configure.cxx_stdlib
    146 }
     144configure.cxx_stdlib
    147145
    148146build.dir           ${configure.dir}
  • trunk/dports/lang/gcc46/Portfile

    r120596 r121269  
    124124
    125125# "-stdlib" would be passed on to the bootstrap compiler if present
    126 if {[info exists configure.cxx_stdlib]} {
    127     configure.cxx_stdlib
    128 }
     126configure.cxx_stdlib
    129127
    130128build.dir           ${configure.dir}
  • trunk/dports/lang/gcc47/Portfile

    r120596 r121269  
    123123
    124124# "-stdlib" would be passed on to the bootstrap compiler if present
    125 if {[info exists configure.cxx_stdlib]} {
    126     configure.cxx_stdlib
    127 }
     125configure.cxx_stdlib
    128126
    129127build.dir           ${configure.dir}
  • trunk/dports/lang/gcc48/Portfile

    r120596 r121269  
    9999
    100100# "-stdlib" would be passed on to the bootstrap compiler if present
    101 if {[info exists configure.cxx_stdlib]} {
    102     configure.cxx_stdlib
    103 }
     101configure.cxx_stdlib
    104102
    105103build.dir           ${configure.dir}
  • trunk/dports/lang/gcc49/Portfile

    r120596 r121269  
    100100
    101101# "-stdlib" would be passed on to the bootstrap compiler if present
    102 if {[info exists configure.cxx_stdlib]} {
    103     configure.cxx_stdlib
    104 }
     102configure.cxx_stdlib
    105103
    106104build.dir           ${configure.dir}
  • trunk/dports/lang/llvm-3.5/Portfile

    r120875 r121269  
    119119compiler.blacklist *gcc* {clang < 300}
    120120
    121 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    122121platform darwin {
    123122    # Note that we are forcing this choice.  This means that anything linking
     
    125124    # problematic, but luckily there is just a limited set of such dependents.
    126125
    127     if {[info exists configure.cxx_stdlib]} {
    128         configure.cxx_stdlib libc++
    129     }
    130 
     126    configure.cxx_stdlib libc++
    131127    depends_lib-append port:libcxx
    132 }
    133 
    134 pre-fetch {
    135     if {(${os.major} < 13 && ! [info exists configure.cxx_stdlib]) ||
    136         (! [file exists /usr/lib/libc++.dylib])} {
    137         ui_error "$name requires a C++11 runtime, which your configuration does not allow"
    138         error "unsupported configuration"
     128
     129    pre-fetch {
     130        if {![file exists /usr/lib/libc++.dylib]} {
     131            ui_error "$name requires a C++11 runtime, which your configuration does not allow"
     132            error "unsupported configuration"
     133        }
    139134    }
    140135}
  • trunk/dports/mail/claws-mail/Portfile

    r120565 r121269  
    4848# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    4949platform darwin {
    50     set cxxstdlib {}
    51 
    52     if {[info exists configure.cxx_stdlib] &&
    53         ${configure.cxx_stdlib} ne {} &&
    54         [string match *clang* ${configure.cxx}]} {
    55         set cxxstdlib ${configure.cxx_stdlib}
    56     } elseif {[string match *clang* ${configure.cxx}] &&
    57               ${os.major} >= 13} {
    58         set cxxstdlib libc++
    59     } else {
    60         set cxxstdlib libstdc++
    61     }
    62 
    63     if {${cxxstdlib} eq "libstdc++"} {
     50    if {${configure.cxx_stdlib} eq "libstdc++"} {
    6451       depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
    6552       depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
  • trunk/dports/multimedia/VLC-devel/Portfile

    r120565 r121269  
    8686        ${worksrcpath}/modules/text_renderer/svg.c
    8787
    88     set cxxstdlib {}
    89 
    90     if {[info exists configure.cxx_stdlib] &&
    91         ${configure.cxx_stdlib} ne {} &&
    92         [string match *clang* ${configure.cxx}]} {
    93         set cxxstdlib ${configure.cxx_stdlib}
    94     } elseif {[string match *clang* ${configure.cxx}] &&
    95               ${os.major} >= 13} {
    96         set cxxstdlib libc++
    97     } else {
    98         set cxxstdlib libstdc++
    99     }
    100 
    101     if {${cxxstdlib} == "libc++"} {
     88    if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
    10289        reinplace "s:-lstdc\+\+:-lc++:" \
    10390            ${worksrcpath}/configure.ac \
  • trunk/dports/multimedia/VLC/Portfile

    r121118 r121269  
    8282        ${worksrcpath}/modules/text_renderer/svg.c
    8383
    84     set cxxstdlib {}
    85 
    86     if {[info exists configure.cxx_stdlib] &&
    87         ${configure.cxx_stdlib} ne {} &&
    88         [string match *clang* ${configure.cxx}]} {
    89         set cxxstdlib ${configure.cxx_stdlib}
    90     } elseif {[string match *clang* ${configure.cxx}] &&
    91               ${os.major} >= 13} {
    92         set cxxstdlib libc++
    93     } else {
    94         set cxxstdlib libstdc++
    95     }
    96 
    97     if {${cxxstdlib} == "libc++"} {
     84    if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} == "libc++"} {
    9885        reinplace "s:-lstdc\+\+:-lc++:" \
    9986            ${worksrcpath}/configure.ac \
  • trunk/dports/multimedia/gtkpod/Portfile

    r115137 r121269  
    3232                    path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
    3333
    34 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    3534platform darwin {
    36     set cxxstdlib {}
    37 
    38     if {[info exists configure.cxx_stdlib] &&
    39         ${configure.cxx_stdlib} ne {} &&
    40         [string match *clang* ${configure.cxx}]} {
    41         set cxxstdlib ${configure.cxx_stdlib}
    42     } elseif {[string match *clang* ${configure.cxx}] &&
    43               ${os.major} >= 13} {
    44         set cxxstdlib libc++
    45     } else {
    46         set cxxstdlib libstdc++
    47     }
    48 
    49     if {${cxxstdlib} eq "libstdc++"} {
     35    if {${configure.cxx_stdlib} eq "libstdc++"} {
    5036       depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
    5137       depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
  • trunk/dports/multimedia/libmatroska/Portfile

    r112434 r121269  
    4040
    4141set cxx_stdlibflags {}
    42 if {[info exists configure.cxx_stdlib] &&
    43     ${configure.cxx_stdlib} ne {} &&
    44     [string match *clang* ${configure.cxx}]} {
     42if {[string match *clang* ${configure.cxx}]} {
    4543    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    4644}
  • trunk/dports/multimedia/live555/Portfile

    r117537 r121269  
    3030patchfiles       patch-config.macosx.diff
    3131post-patch {
    32     set cxx_stdlibflags {}
    33     if {[info exists configure.cxx_stdlib] &&
    34         ${configure.cxx_stdlib} ne {} &&
    35         [string match *clang* ${configure.cxx}]} {
     32set cxx_stdlibflags {}
     33    if {[string match *clang* ${configure.cxx}]} {
    3634        set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    3735    }
  • trunk/dports/net/dibbler/Portfile

    r110828 r121269  
    4040
    4141# TODO: Fix libc++ build.
    42 if {[info exists configure.cxx_stdlib]} {
    43     configure.cxx_stdlib libstdc++
    44 }
     42configure.cxx_stdlib libstdc++
    4543
    4644post-destroot {
  • trunk/dports/net/gpsd/Portfile

    r115378 r121269  
    3737variant universal {}
    3838
    39 # TODO: Simplify once MacPorts 2.3 is released
    4039set cxx_stdlibflags {}
    41 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     40if {[string match *clang* ${configure.cxx}]} {
    4241    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    4342}
  • trunk/dports/print/lcdf-typetools/Portfile

    r112432 r121269  
    2828patchfiles-append   static_assert.patch
    2929
    30 if {[info exists configure.cxx_stdlib] &&
    31     ${configure.cxx_stdlib} eq {libc++} &&
     30if {${configure.cxx_stdlib} eq {libc++} &&
    3231    [string match *clang* ${configure.cxx}]
    3332} then {
  • trunk/dports/python/py-pysvn/Portfile

    r115387 r121269  
    2727python.versions 25 26 27
    2828
    29 # TODO: Simplify once MacPorts 2.3 is released
    3029set cxx_stdlibflags {}
    31 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     30if {[string match *clang* ${configure.cxx}]} {
    3231    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    3332}
  • trunk/dports/python/py26-webkitgtk/Portfile

    r115496 r121269  
    2727set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6
    2828
    29 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    3029platform darwin {
    31     set cxxstdlib {}
    32 
    33     if {[info exists configure.cxx_stdlib] &&
    34         ${configure.cxx_stdlib} ne {} &&
    35         [string match *clang* ${configure.cxx}]} {
    36         set cxxstdlib ${configure.cxx_stdlib}
    37     } elseif {[string match *clang* ${configure.cxx}] &&
    38               ${os.major} >= 13} {
    39         set cxxstdlib libc++
    40     } else {
    41         set cxxstdlib libstdc++
    42     }
    43 
    44     if {${cxxstdlib} eq "libstdc++"} {
     30    if {${configure.cxx_stdlib} eq "libstdc++"} {
    4531       depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
    4632       depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
  • trunk/dports/python/py27-webkitgtk/Portfile

    r115494 r121269  
    2525                rmd160  e857939e65a9a409390f1fd256310988f592935f
    2626
    27 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    2827platform darwin {
    29     set cxxstdlib {}
    30 
    31     if {[info exists configure.cxx_stdlib] &&
    32         ${configure.cxx_stdlib} ne {} &&
    33         [string match *clang* ${configure.cxx}]} {
    34         set cxxstdlib ${configure.cxx_stdlib}
    35     } elseif {[string match *clang* ${configure.cxx}] &&
    36               ${os.major} >= 13} {
    37         set cxxstdlib libc++
    38     } else {
    39         set cxxstdlib libstdc++
    40     }
    41 
    42     if {${cxxstdlib} eq "libstdc++"} {
     28    if {${configure.cxx_stdlib} eq "libstdc++"} {
    4329       depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
    4430       depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
  • trunk/dports/science/gildas/Portfile

    r121030 r121269  
    6060}
    6161
    62 set cxxstdlib {}
    63 platform darwin {
    64     if {[info exists configure.cxx_stdlib] &&
    65         ${configure.cxx_stdlib} ne {} &&
    66         [string match *clang* ${configure.cxx}]} {
    67         set cxxstdlib ${configure.cxx_stdlib}
    68     } elseif {[string match *clang* ${configure.cxx}] &&
    69               ${os.major} >= 13} {
    70         set cxxstdlib libc++
    71     } else {
    72         set cxxstdlib libstdc++
    73     }
    74 
    75     if {[string length ${cxxstdlib}]} {
    76         set cxxstdlib [string map {lib -l} ${cxxstdlib}]
    77     }
    78 }
    79 
    8062post-extract {
    8163    if {![gcc_variant_isset]} {
     
    8567
    8668configure {
     69    set cxxstdlib {}
     70    if {[string match *clang* ${configure.cxx}]} {
     71        set cxxstdlib [string map {lib -l} ${configure.cxx_stdlib}]
     72    }
     73
    8774    reinplace -W ${worksrcpath}/admin "s|@CC@|${configure.cc}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
    8875    reinplace -W ${worksrcpath}/admin "s|@CCFLAGS@|${configure.cflags}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
  • trunk/dports/science/gqrx/Portfile

    r118976 r121269  
    2424    # devel from upstream.
    2525
    26     # configure.cxx_stdlib works with MacPorts SVN trunk, not release;
    27     # do something else until both work.
    28 
    29     # if {[info exists configure.cxx_stdlib] && [string match libc++ ${configure.cxx_stdlib}]}
    30 
    3126    patchfiles-append patch-fix-real-imag.diff
    32 
    3327}
    3428
  • trunk/dports/science/root5/Portfile

    r121123 r121269  
    118118                    --enable-builtin-freetype
    119119
    120 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    121120platform darwin {
    122     set cxxstdlib {}
    123 
    124     if {[info exists configure.cxx_stdlib] &&
    125         ${configure.cxx_stdlib} ne {} &&
    126         [string match *clang* ${configure.cxx}]} {
    127         set cxxstdlib ${configure.cxx_stdlib}
    128     } elseif {[string match *clang* ${configure.cxx}] &&
    129               ${os.major} >= 13} {
    130         set cxxstdlib libc++
    131     } else {
    132         set cxxstdlib libstdc++
    133     }
    134 
    135     if {${cxxstdlib} eq "libc++"} {
     121    if {${configure.cxx_stdlib} eq "libc++"} {
    136122        configure.args-delete --disable-c++11
    137123        configure.args-append --enable-c++11
  • trunk/dports/tex/texlive-bin/Portfile

    r120845 r121269  
    199199                            OBJCXX=${configure.objcxx}
    200200
    201 if {[info exists configure.cxx_stdlib] &&
    202     ${configure.cxx_stdlib} ne {} &&
    203     [string match *clang* ${configure.cxx}]
    204 } then {
     201if {[string match *clang* ${configure.cxx}]} {
    205202    build.env-append        OBJCXXFLAGS="${configure.objcxxflags} [get_canonical_archflags objcxx] -stdlib=${configure.cxx_stdlib}"
    206203} else {
  • trunk/dports/textproc/bibledit/Portfile

    r120912 r121269  
    3838worksrcdir                      ${name}-gtk-${version}
    3939
    40 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    4140platform darwin {
    42     set cxxstdlib {}
    43 
    44     if {[info exists configure.cxx_stdlib] &&
    45         ${configure.cxx_stdlib} ne {} &&
    46         [string match *clang* ${configure.cxx}]} {
    47         set cxxstdlib ${configure.cxx_stdlib}
    48     } elseif {[string match *clang* ${configure.cxx}] &&
    49               ${os.major} >= 13} {
    50         set cxxstdlib libc++
    51     } else {
    52         set cxxstdlib libstdc++
    53     }
    54 
    55     if {${cxxstdlib} eq "libstdc++"} {
     41    if {${configure.cxx_stdlib} eq "libstdc++"} {
    5642       depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
    5743       depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
  • trunk/dports/textproc/doxygen/Portfile

    r120830 r121269  
    7474}
    7575
    76 # TODO: Simplify once MacPorts 2.3 is released
    7776set cxx_stdlibflags {}
    78 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     77if {[string match *clang* ${configure.cxx}]} {
    7978    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    8079}
  • trunk/dports/textproc/libebml/Portfile

    r112433 r121269  
    3838
    3939set cxx_stdlibflags {}
    40 if {[info exists configure.cxx_stdlib] &&
    41     ${configure.cxx_stdlib} ne {} &&
    42     [string match *clang* ${configure.cxx}]} {
     40if {[string match *clang* ${configure.cxx}]} {
    4341    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    4442}
  • trunk/dports/textproc/libxl/Portfile

    r115936 r121269  
    3232
    3333# The pre-compiled library is linked with libstdc++.
    34 if {[info exists configure.cxx_stdlib]} {
    35     configure.cxx_stdlib libstdc++
    36 }
     34configure.cxx_stdlib libstdc++
    3735
    3836set libxl           lib/libxl.dylib
  • trunk/dports/textproc/openjade/Portfile

    r119131 r121269  
    4747compiler.blacklist    gcc-4.0 gcc-3.3
    4848
    49 # TODO: Simplify once MacPorts 2.3 is released
    5049set cxx_stdlibflags {}
    51 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
    52     set cxx_stdlibflags "-stdlib=${configure.cxx_stdlib}"
     50if {[string match *clang* ${configure.cxx}]} {
     51    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    5352}
    5453
  • trunk/dports/textproc/sdcv/Portfile

    r115210 r121269  
    3333                        port:zlib
    3434
    35 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    3635platform darwin {
    37     set cxxstdlib {}
    38 
    39     if {[info exists configure.cxx_stdlib] &&
    40         ${configure.cxx_stdlib} ne {} &&
    41         [string match *clang* ${configure.cxx}]} {
    42         set cxxstdlib ${configure.cxx_stdlib}
    43     } elseif {[string match *clang* ${configure.cxx}] &&
    44               ${os.major} >= 13} {
    45         set cxxstdlib libc++
    46     } else {
    47         set cxxstdlib libstdc++
    48     }
    49 
    50     if {${cxxstdlib} eq "libstdc++"} {
     36    if {${configure.cxx_stdlib} eq "libstdc++"} {
    5137        # C++11 is required.
    5238        # https://sourceforge.net/p/sdcv/bugs/7/
  • trunk/dports/www/midori/Portfile

    r115418 r121269  
    4747configure.args-append --disable-zeitgeist
    4848
    49 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    5049platform darwin {
    51     set cxxstdlib {}
    52 
    53     if {[info exists configure.cxx_stdlib] &&
    54         ${configure.cxx_stdlib} ne {} &&
    55         [string match *clang* ${configure.cxx}]} {
    56         set cxxstdlib ${configure.cxx_stdlib}
    57     } elseif {[string match *clang* ${configure.cxx}] &&
    58               ${os.major} >= 13} {
    59         set cxxstdlib libc++
    60     } else {
    61         set cxxstdlib libstdc++
    62     }
    63 
    64     if {${cxxstdlib} eq "libstdc++"} {
     50    if {${configure.cxx_stdlib} eq "libstdc++"} {
    6551       depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
    6652       depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
  • trunk/dports/www/uzbl/Portfile

    r117713 r121269  
    4646eval destroot.args  ${build.args}
    4747
    48 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    4948platform darwin {
    50     set cxxstdlib {}
    51 
    52     if {[info exists configure.cxx_stdlib] &&
    53         ${configure.cxx_stdlib} ne {} &&
    54         [string match *clang* ${configure.cxx}]} {
    55         set cxxstdlib ${configure.cxx_stdlib}
    56     } elseif {[string match *clang* ${configure.cxx}] &&
    57               ${os.major} >= 13} {
    58         set cxxstdlib libc++
    59     } else {
    60         set cxxstdlib libstdc++
    61     }
    62 
    63     if {${cxxstdlib} eq "libstdc++"} {
     49    if {${configure.cxx_stdlib} eq "libstdc++"} {
    6450       depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
    6551       depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
  • trunk/dports/www/webkit-gtk-2.0/Portfile

    r120881 r121269  
    8383        --enable-webgl
    8484
    85 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    8685platform darwin {
    8786    pre-configure {
    88         set cxxstdlib {}
    89 
    90         if {[info exists configure.cxx_stdlib] &&
    91             ${configure.cxx_stdlib} ne {} &&
    92             [string match *clang* ${configure.cxx}]} {
    93             set cxxstdlib ${configure.cxx_stdlib}
    94         } elseif {[string match *clang* ${configure.cxx}] &&
    95                   ${os.major} >= 13} {
    96             set cxxstdlib libc++
    97         } else {
    98             set cxxstdlib libstdc++
    99         }
    100 
    101         if {${cxxstdlib} eq "libc++"} {
     87        if {${configure.cxx_stdlib} eq "libc++"} {
    10288            ui_error "${name} is provided for configurations that are unable to use webkit-gtk.  Since you are on Mavericks or later (or have configured MacPorts to use libc++), please use webkit-gtk or webkit-gtk-devel instead."
    10389            error "unsupported configuration"
  • trunk/dports/www/webkit-gtk-devel/Portfile

    r120899 r121269  
    9090        --disable-jit
    9191
    92 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    9392platform darwin {
    9493    pre-configure {
    95         set cxxstdlib {}
    96 
    97         if {[info exists configure.cxx_stdlib] &&
    98             ${configure.cxx_stdlib} ne {} &&
    99             [string match *clang* ${configure.cxx}]} {
    100             set cxxstdlib ${configure.cxx_stdlib}
    101         } elseif {[string match *clang* ${configure.cxx}] &&
    102                   ${os.major} >= 13} {
    103             set cxxstdlib libc++
    104         } else {
    105             set cxxstdlib libstdc++
    106         }
    107 
    108         if {${cxxstdlib} eq "libstdc++"} {
     94        if {${configure.cxx_stdlib} eq "libstdc++"} {
    10995            ui_error "${subport} is not supported for this installation of MacPorts.  It requires libc++ be selected as your C++ runtime.  Please use ${subport}-2.0 instead"
    11096            error "unsupported configuration"
  • trunk/dports/www/webkit-gtk/Portfile

    r120899 r121269  
    9090        --disable-jit
    9191
    92 # TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
    9392platform darwin {
    9493    pre-configure {
    95         set cxxstdlib {}
    96 
    97         if {[info exists configure.cxx_stdlib] &&
    98             ${configure.cxx_stdlib} ne {} &&
    99             [string match *clang* ${configure.cxx}]} {
    100             set cxxstdlib ${configure.cxx_stdlib}
    101         } elseif {[string match *clang* ${configure.cxx}] &&
    102                   ${os.major} >= 13} {
    103             set cxxstdlib libc++
    104         } else {
    105             set cxxstdlib libstdc++
    106         }
    107 
    108         if {${cxxstdlib} eq "libstdc++"} {
     94        if {${configure.cxx_stdlib} eq "libstdc++"} {
    10995            ui_error "${subport} is not supported for this installation of MacPorts.  It requires libc++ be selected as your C++ runtime.  Please use ${subport}-2.0 instead"
    11096            error "unsupported configuration"
  • trunk/dports/x11/mesa/Portfile

    r120376 r121269  
    6363}
    6464
    65 # TODO: Simplify once MacPorts 2.3 is released
    6665set cxx_stdlibflags {}
    67 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     66if {[string match *clang* ${configure.cxx}]} {
    6867    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
    6968}
  • trunk/dports/x11/rxvt-unicode/Portfile

    r119368 r121269  
    5555patchfiles      patch-Makefile.in.diff
    5656
    57 # TODO: Simplify once MacPorts 2.3 is released
    58 if {[info exists configure.cxx_stdlib] && ${configure.cxx_stdlib} ne {} && [string match *clang* ${configure.cxx}]} {
     57if {[string match *clang* ${configure.cxx}]} {
    5958    configure.ldflags-append -stdlib=${configure.cxx_stdlib}
    6059}
Note: See TracChangeset for help on using the changeset viewer.