Changeset 99544

Timestamp:

Nov 9, 2012, 3:35:40 PM (11 years ago)

Author:

nicos@…

Message:

kdevelop: update 4.4.1, enabling universal variant

File:

• trunk/dports/kde/kdevelop/Portfile (modified) (4 diffs)

trunk/dports/kde/kdevelop/Portfile

@@ -4 +4 @@
 PortSystem          1.0
 PortGroup           kde4 1.1
+PortGroup           muniversal 1.0
 
 name                kdevelop
-version             4.4.0
-revision            1
+version             4.4.1
 categories          kde kde4
 platforms           darwin
@@ -24 +24 @@
 master_sites        kde:stable/kdevelop/${version}/src/
 
-checksums           rmd160  5bef6f24b9c43175c09fc8820139dcd5635103b5 \
-                    sha256  eb276293a67f934919319e7561344a23e1e6fb07d3dc1aedbb424d9dc11f5f91
+checksums           rmd160  e37a5f25711bb283b68e7a8d2a2f194c3176abcb \
+                    sha256  7efac56e0390910247e8d3c4a80ce215a1dc4c75b0a1ecc5b594d8de35acde0c
 
 use_bzip2           yes
@@ -36 +36 @@
                     port:oxygen-icons
 
-#Avoid automatic use of valgrind unless specified in variant
-#Avoid automatic use of okteta unless specified in variant
-#Suppress general std=c++0x definition which crashes with pure C files
+#1. Avoid automatic use of valgrind unless specified in variant
+#2. Avoid automatic use of okteta unless specified in variant
+#3. Suppress general std=c++0x definition which crashes with pure C files
+#4-5. Change use of std::list with QList which is recognized during build
 patchfiles          patch-ConfigureChecks.diff \
                     patch-okteta.diff \
-                    patch-Cxx.diff
+                    patch-Cxx.diff \
+                    patch-declarationbuilder.diff \
+                    patch-context.diff
 
 if {![variant_isset docs]} {
@@ -57 +60 @@
 }    
 
-#Adjusting configure flags for Clang
-if {${configure.compiler} == "clang"} {
-    if {${os.major} >= 11} {
-        #Case of Lion and higher (ticket #34545)
-        configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal -stdlib=libc++" \
-                                -DHAVE_UNORDERED_MAP=1
-        patchfiles-append       patch-declarationbuilder.diff patch-context.diff
+#Deleting double architecture build from cmake group
+pre-configure {
+    configure.universal_args-delete \
+        -DCMAKE_OSX_ARCHITECTURES=\"[join ${configure.universal_archs} \;]\"
+    if {${configure.sdkroot} != ""} {
+        configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
     } else {
-        #Patching code for clang on SL where libc++ is not available
-        configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal"
+        configure.args-append -DCMAKE_OSX_SYSROOT=/
+    }
+}
+
+if {${configure.compiler} == "clang" && ${os.major} >= 11} {
+    array set merger_configure_args {
+        x86_64 "-DCMAKE_CXX_FLAGS=\"-stdlib=libc++\" -DHAVE_UNORDERED_MAP=1"
+    }
+}
+
+if {![variant_isset universal]} {
+    #Using c++0x for Lion and higher in case of clang 64-bit
+    if {${configure.compiler} == "clang" && ${build_arch} == "x86_64" && ${os.major} >= 11} {
+        configure.args-append   -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DHAVE_UNORDERED_MAP=1
     }
 }