Ignore:
Timestamp:
Jul 5, 2010, 6:03:12 AM (8 years ago)
Author:
jmr@…
Message:

openssl: add configure.sdkroot support, remove check for build_arch existence (see #25114)

File:
1 edited

Legend:

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

    r68429 r69417  
    5454        # Ensure that the correct compiler is used
    5555        reinplace "s|cc:|${configure.cc}:|" ${worksrcpath}/Configure
     56        # use SDK if necessary
     57        if {${configure.sdkroot} != ""} {
     58                reinplace "s|\\(-arch \[_a-zA-Z0-9\]*\\)|\\1 -isysroot ${configure.sdkroot}|" ${worksrcpath}/Configure
     59        }
    5660}
    5761
     
    6569if { [variant_isset universal] } {
    6670        configure.cmd   ./Configure
    67 
    68         post-patch {
    69         # For universal builds on ppc tiger, add sysroot
    70         if {${os.arch} == "powerpc" && ${os.major} == "8"} {
    71             reinplace "s|\\(-arch \[_a-zA-Z0-9\]*\\)|\\1 -isysroot ${developer_dir}/SDKs/MacOSX10.4u.sdk|" ${worksrcpath}/Configure
    72         }
    73         }
    7471
    7572        set merger_arch_compiler "no"
     
    9289                x86_64  ""
    9390        }
    94 } elseif {[info exists build_arch] && [info exists merger_configure_args($build_arch)]} {
     91} elseif {[info exists merger_configure_args($build_arch)]} {
    9592    configure.cmd           ./Configure
    9693    configure.args-append   $merger_configure_args($build_arch)
Note: See TracChangeset for help on using the changeset viewer.