Changeset 99826


Ignore:
Timestamp:
Nov 18, 2012, 11:54:44 AM (7 years ago)
Author:
ryandesign@…
Message:

kdevelop, kdevplatform: update for changes to cmake portgroup; simplify clang and Lion-and-up c++0x addition

Location:
trunk/dports/kde
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/kde/kdevelop/Portfile

    r99544 r99826  
    6060}   
    6161
    62 #Deleting double architecture build from cmake group
    63 pre-configure {
    64     configure.universal_args-delete \
    65         -DCMAKE_OSX_ARCHITECTURES=\"[join ${configure.universal_archs} \;]\"
    66     if {${configure.sdkroot} != ""} {
    67         configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
    68     } else {
    69         configure.args-append -DCMAKE_OSX_SYSROOT=/
    70     }
    71 }
    72 
    73 if {${configure.compiler} == "clang" && ${os.major} >= 11} {
    74     array set merger_configure_args {
    75         x86_64 "-DCMAKE_CXX_FLAGS=\"-stdlib=libc++\" -DHAVE_UNORDERED_MAP=1"
    76     }
    77 }
    78 
    79 if {![variant_isset universal]} {
    80     #Using c++0x for Lion and higher in case of clang 64-bit
    81     if {${configure.compiler} == "clang" && ${build_arch} == "x86_64" && ${os.major} >= 11} {
    82         configure.args-append   -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
     62#Using c++0x for Lion and higher in case of clang 64-bit
     63if {${configure.compiler} == "clang" && ${os.platform} == "darwin" && ${os.major} >= 11} {
     64    lappend merger_configure_args(x86_64)   -DCMAKE_CXX_FLAGS='-stdlib=libc++' -DHAVE_UNORDERED_MAP=1
     65    if {${build_arch} == "x86_64" && ![variant_isset universal]} {
     66        configure.args-append               -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
    8367    }
    8468}
  • trunk/dports/kde/kdevplatform/Portfile

    r99541 r99826  
    4545}
    4646
    47 #Deleting double architecture build from cmake group
    48 pre-configure {
    49     configure.universal_args-delete \
    50         -DCMAKE_OSX_ARCHITECTURES=\"[join ${configure.universal_archs} \;]\"
    51     if {${configure.sdkroot} != ""} {
    52         configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
    53     } else {
    54         configure.args-append -DCMAKE_OSX_SYSROOT=/
    55     }
    56 }
    57 
    58 if {${configure.compiler} == "clang" && ${os.major} >= 11} {
    59     array set merger_configure_args {
    60         i386   ""
    61         x86_64 "-DCMAKE_CXX_FLAGS=\"-stdlib=libc++\" -DHAVE_UNORDERED_MAP=1"
    62     }
    63 }
    64 
    65 if {![variant_isset universal]} {
    66     #Using c++0x for Lion and higher in case of clang 64-bit
    67     if {${configure.compiler} == "clang" && ${build_arch} == "x86_64" && ${os.major} >= 11} {
    68         configure.args-append   -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
     47#Using c++0x for Lion and higher in case of clang 64-bit
     48if {${configure.compiler} == "clang" && ${os.platform} == "darwin" && ${os.major} >= 11} {
     49    lappend merger_configure_args(x86_64)   -DCMAKE_CXX_FLAGS='-stdlib=libc++' -DHAVE_UNORDERED_MAP=1
     50    if {${build_arch} == "x86_64" && ![variant_isset universal]} {
     51        configure.args-append               -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
    6952    }
    7053}
Note: See TracChangeset for help on using the changeset viewer.