Changeset 99544


Ignore:
Timestamp:
Nov 9, 2012, 3:35:40 PM (8 years ago)
Author:
nicos@…
Message:

kdevelop: update 4.4.1, enabling universal variant

File:
1 edited

Legend:

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

    r99254 r99544  
    44PortSystem          1.0
    55PortGroup           kde4 1.1
     6PortGroup           muniversal 1.0
    67
    78name                kdevelop
    8 version             4.4.0
    9 revision            1
     9version             4.4.1
    1010categories          kde kde4
    1111platforms           darwin
     
    2424master_sites        kde:stable/kdevelop/${version}/src/
    2525
    26 checksums           rmd160  5bef6f24b9c43175c09fc8820139dcd5635103b5 \
    27                     sha256  eb276293a67f934919319e7561344a23e1e6fb07d3dc1aedbb424d9dc11f5f91
     26checksums           rmd160  e37a5f25711bb283b68e7a8d2a2f194c3176abcb \
     27                    sha256  7efac56e0390910247e8d3c4a80ce215a1dc4c75b0a1ecc5b594d8de35acde0c
    2828
    2929use_bzip2           yes
     
    3636                    port:oxygen-icons
    3737
    38 #Avoid automatic use of valgrind unless specified in variant
    39 #Avoid automatic use of okteta unless specified in variant
    40 #Suppress general std=c++0x definition which crashes with pure C files
     38#1. Avoid automatic use of valgrind unless specified in variant
     39#2. Avoid automatic use of okteta unless specified in variant
     40#3. Suppress general std=c++0x definition which crashes with pure C files
     41#4-5. Change use of std::list with QList which is recognized during build
    4142patchfiles          patch-ConfigureChecks.diff \
    4243                    patch-okteta.diff \
    43                     patch-Cxx.diff
     44                    patch-Cxx.diff \
     45                    patch-declarationbuilder.diff \
     46                    patch-context.diff
    4447
    4548if {![variant_isset docs]} {
     
    5760}   
    5861
    59 #Adjusting configure flags for Clang
    60 if {${configure.compiler} == "clang"} {
    61     if {${os.major} >= 11} {
    62         #Case of Lion and higher (ticket #34545)
    63         configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal -stdlib=libc++" \
    64                                 -DHAVE_UNORDERED_MAP=1
    65         patchfiles-append       patch-declarationbuilder.diff patch-context.diff
     62#Deleting double architecture build from cmake group
     63pre-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}"
    6668    } else {
    67         #Patching code for clang on SL where libc++ is not available
    68         configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal"
     69        configure.args-append -DCMAKE_OSX_SYSROOT=/
     70    }
     71}
     72
     73if {${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
     79if {![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
    6983    }
    7084}
Note: See TracChangeset for help on using the changeset viewer.