Changeset 71610


Ignore:
Timestamp:
Sep 18, 2010, 2:04:15 AM (10 years ago)
Author:
ryandesign@…
Message:

Use supported_archs to force a 32-bit build instead of manually manipulating build_arch; see #26503

Location:
trunk/dports
Files:
17 edited

Legend:

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

    r59070 r71610  
    2727
    2828# current version uses NSMailDelivery which is not available in 64-bit
    29 if {$build_arch == "x86_64"} {
    30     configure.build_arch i386
    31 } elseif {$build_arch == "ppc64"} {
    32     configure.build_arch ppc
    33 }
     29supported_archs         i386 ppc
    3430if {[variant_isset universal] && [string match *64* $universal_archs]} {
    3531    pre-fetch {
  • trunk/dports/aqua/TeXShop/Portfile

    r71428 r71610  
    2828
    2929# force 32-bit, ticket #20291
    30 if {$build_arch == "x86_64"} {
    31     configure.build_arch i386
    32 } elseif {$build_arch == "ppc64"} {
    33     configure.build_arch ppc
    34 }
     30supported_archs i386 ppc
    3531post-extract    {
    3632    reinplace "s/defaultConfigurationName = Debug/defaultConfigurationName = Release/" ${worksrcpath}/${name}.xcodeproj/project.pbxproj
  • trunk/dports/aqua/fltk/Portfile

    r64763 r71610  
    5050
    5151# Force 32-bit (#21054)
    52 if {${build_arch} == "x86_64"} {
    53     configure.build_arch i386
    54     configure.args-append   --with-archflags="-arch i386"
    55 } elseif {${build_arch} == "ppc64"} {
    56     configure.build_arch ppc
    57     configure.args-append   --with-archflags="-arch ppc"
    58 }
     52supported_archs i386 ppc
     53configure.args-append   --with-archflags="-arch ${configure.build_arch}"
    5954
    6055use_parallel_build  yes
  • trunk/dports/aqua/pgAdmin3/Portfile

    r70298 r71610  
    4848build.target    all install
    4949
    50 if {$build_arch == "x86_64"} {
    51     configure.build_arch i386
    52 } elseif {$build_arch == "ppc64"} {
    53     configure.build_arch ppc
    54 }
    55 if {![info exists configure.ld_archflags]} {
    56     eval configure.ldflags-append ${configure.cc_archflags}
    57 }
     50supported_archs i386 ppc
     51
    5852# wxWidgets is not universal
    5953universal_variant no
  • trunk/dports/devel/allegro/Portfile

    r64579 r71610  
    3131}
    3232
    33 platform darwin 10 {
    34     # Does not compile 64-bit due to NSQuickDraw
    35     # and probably other old API usage
    36     configure.build_arch i386
    37 }
     33# Does not compile 64-bit due to NSQuickDraw
     34# and probably other old API usage
     35supported_archs i386 ppc
    3836
    3937livecheck.type  regex
  • trunk/dports/devel/xulrunner-devel/Portfile

    r70574 r71610  
    123123
    124124# Force 32-bit, inline-asm
    125 if {$build_arch == "x86_64"} {
    126     configure.build_arch i386   
    127 } elseif {$build_arch == "ppc64"} {
    128     configure.build_arch ppc
    129 }
     125supported_archs i386 ppc
    130126
    131127variant debug description {build with debugging symbols} {
  • trunk/dports/devel/xulrunner/Portfile

    r70575 r71610  
    123123
    124124# Force 32-bit, inline-asm
    125 if {$build_arch == "x86_64"} {
    126     configure.build_arch i386   
    127 } elseif {$build_arch == "ppc64"} {
    128     configure.build_arch ppc
    129 }
     125supported_archs i386 ppc
    130126
    131127variant debug description {build with debugging symbols} {
  • trunk/dports/emulators/dosbox/Portfile

    r61162 r71610  
    5555}
    5656
    57 if {${build_arch} == "x86_64"} {
    58     configure.build_arch i386
    59 } elseif {${build_arch} == "ppc64"} {
    60     configure.build_arch ppc
    61 }
     57supported_archs     i386 ppc
    6258
    6359platform darwin {
  • trunk/dports/games/liquidwar/Portfile

    r66287 r71610  
    3434}
    3535
    36 if {$build_arch == "x86_64"} {
    37     # Allegro does not compile 64-bit due to NS* stuff, so we have to do i386
    38     configure.build_arch i386
    39 } elseif {$build_arch == "ppc64"} {
    40     configure.build_arch ppc
    41 }
     36# Allegro does not compile 64-bit due to NS* stuff, so we have to do 32-bit
     37supported_archs i386 ppc
    4238
    4339configure.cflags-append     -DALLEGRO_UNIX
  • trunk/dports/graphics/wxWidgets-python/Portfile

    r69474 r71610  
    8484
    8585variant carbon conflicts gtk description {use carbon} {
     86    supported_archs i386 ppc
    8687    configure.args-append --with-mac
    87     if {$build_arch == "x86_64"} {
    88         configure.build_arch i386
    89         configure.cflags-append -arch i386
    90         configure.ldflags-append -arch i386
    91         configure.cxxflags-append -arch i386
    92         configure.cppflags-append -arch i386
    93         configure.objcflags-append -arch i386
    94     } elseif {$build_arch == "ppc64"} {
    95         configure.build_arch ppc
    96     }
    97     if {![info exists configure.ld_archflags]} {
    98         eval configure.ldflags-append ${configure.cc_archflags}
    99     }
     88    configure.cflags-append -arch ${configure.build_arch}
     89    configure.ldflags-append -arch ${configure.build_arch}
     90    configure.cxxflags-append -arch ${configure.build_arch}
     91    configure.cppflags-append -arch ${configure.build_arch}
     92    configure.objcflags-append -arch ${configure.build_arch}
    10093}
    10194variant gtk conflicts carbon description {use gtk} {
  • trunk/dports/graphics/wxWidgets/Portfile

    r69923 r71610  
    8282use_parallel_build no
    8383
    84 if {$build_arch == "x86_64"} {
    85     configure.build_arch i386
    86     configure.cppflags-append -arch i386
    87 } elseif {$build_arch == "ppc64"} {
    88     configure.build_arch ppc
    89 }
    90 if {![info exists configure.ld_archflags]} {
    91     eval configure.ldflags-append ${configure.cc_archflags}
    92 }
     84supported_archs i386 ppc
     85configure.cppflags-append -arch ${configure.build_arch}
    9386
    9487post-build {
  • trunk/dports/lang/scsh/Portfile

    r64134 r71610  
    2424
    2525# Force 32-bit build
    26 switch ${build_arch} {
    27     x86_64 {
    28         configure.build_arch i386
    29     }
    30     ppc64 {
    31         configure.build_arch ppc
    32     }
    33 }
     26supported_archs i386 ppc
  • trunk/dports/science/playerstage-stage/Portfile

    r64763 r71610  
    4444# fltk is 32-bit only.
    4545universal_variant       no
    46 if {${build_arch} == "x86_64"} {
    47     configure.build_arch i386
    48 } elseif {${build_arch} == "ppc64"} {
    49     configure.build_arch ppc
    50 }
     46supported_archs         i386 ppc
    5147
    5248post-build {
  • trunk/dports/sysutils/osxutils/Portfile

    r61231 r71610  
    3838
    3939# all but one of these tools use 32-bit-only carbon bits
    40 if {$build_arch == "x86_64"} {
    41     configure.build_arch i386
    42 } elseif {$build_arch == "ppc64"} {
    43     configure.build_arch ppc
    44 }
     40supported_archs i386 ppc
    4541
    4642set bt {getfcomment geticon hfsdata lsmac mkalias setfcomment setfctypes setfflags seticon setlabel setsuffix wsupdate}
  • trunk/dports/sysutils/synergy/Portfile

    r56602 r71610  
    4444
    4545# Force 32-bit, all kinds of Carbon cruft in here. (#20908)
    46 if {$build_arch == "x86_64"} {
    47     configure.build_arch i386
    48 } elseif {$build_arch == "ppc64"} {
    49     configure.build_arch ppc
    50 }
     46supported_archs i386 ppc
  • trunk/dports/www/firefox-x11-devel/Portfile

    r70569 r71610  
    113113
    114114# Force 32-bit, inline-asm
    115 if {$build_arch == "x86_64"} {
    116     configure.build_arch i386
    117 
    118     # Yes, this is ugly... but the real fix is in the works
    119     # https://bugzilla.mozilla.org/show_bug.cgi?id=529878
    120     configure.cc ${configure.cc} -arch i386
    121     configure.cxx ${configure.cxx} -arch i386
    122 
    123     # Take this out when we ship >1.8.1
    124     configure.ldflags-append -arch i386
    125 } elseif {$build_arch == "ppc64"} {
    126     configure.build_arch ppc
    127 
    128     # Yes, this is ugly... but the real fix is in the works
    129     # https://bugzilla.mozilla.org/show_bug.cgi?id=529878
    130     configure.cc ${configure.cc} -arch ppc
    131     configure.cxx ${configure.cxx} -arch ppc
    132 
    133     # Take this out when we ship >1.8.1
    134     configure.ldflags-append -arch ppc
    135 }
     115supported_archs i386 ppc
     116# Yes, this is ugly... but the real fix is in the works
     117# https://bugzilla.mozilla.org/show_bug.cgi?id=529878
     118configure.cc ${configure.cc} -arch ${configure.build_arch}
     119configure.cxx ${configure.cxx} -arch ${configure.build_arch}
    136120
    137121variant debug description {build with debugging symbols} {
  • trunk/dports/www/firefox-x11/Portfile

    r70570 r71610  
    113113
    114114# Force 32-bit, inline-asm
    115 if {$build_arch == "x86_64"} {
    116     configure.build_arch i386
    117 
    118     # Yes, this is ugly... but the real fix is in the works
    119     # https://bugzilla.mozilla.org/show_bug.cgi?id=529878
    120     configure.cc ${configure.cc} -arch i386
    121     configure.cxx ${configure.cxx} -arch i386
    122 
    123     # Take this out when we ship >1.8.1
    124     configure.ldflags-append -arch i386
    125 } elseif {$build_arch == "ppc64"} {
    126     configure.build_arch ppc
    127 
    128     # Yes, this is ugly... but the real fix is in the works
    129     # https://bugzilla.mozilla.org/show_bug.cgi?id=529878
    130     configure.cc ${configure.cc} -arch ppc
    131     configure.cxx ${configure.cxx} -arch ppc
    132 
    133     # Take this out when we ship >1.8.1
    134     configure.ldflags-append -arch ppc
    135 }
     115supported_archs i386 ppc
     116# Yes, this is ugly... but the real fix is in the works
     117# https://bugzilla.mozilla.org/show_bug.cgi?id=529878
     118configure.cc ${configure.cc} -arch ${configure.build_arch}
     119configure.cxx ${configure.cxx} -arch ${configure.build_arch}
    136120
    137121variant debug description {build with debugging symbols} {
Note: See TracChangeset for help on using the changeset viewer.