[94443] trunk/dports/kde

[nicos at macports.org]

Revision: 94443
          https://trac.macports.org/changeset/94443
Author:   nicos at macports.org
Date:     2012-06-19 07:14:53 -0700 (Tue, 19 Jun 2012)
Log Message:
-----------
kdevplatform/kdevelop: correcting conditionals for clang

Modified Paths:
--------------
    trunk/dports/kde/kdevelop/Portfile
    trunk/dports/kde/kdevplatform/Portfile

Modified: trunk/dports/kde/kdevelop/Portfile
===================================================================
--- trunk/dports/kde/kdevelop/Portfile	2012-06-19 12:02:15 UTC (rev 94442)
+++ trunk/dports/kde/kdevelop/Portfile	2012-06-19 14:14:53 UTC (rev 94443)
@@ -33,21 +33,19 @@
                     port:kate \
                     port:oxygen-icons
 
-platform darwin 10 {
-    #Adjusting flags for clang on SL and 
-    #patching <unordered_map> (ticket #34859)
-    if {${configure.compiler} == "clang"} {
-        patchfiles-append       patch-parser.diff
+#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++"
+        patchfiles-append       patch-declarationbuilder.diff patch-context.diff
+    } else {
+        #Patching code for clang on SL where libc++ is not available
         configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal"
+        patchfiles-append       patch-parser.diff
     }
 }
 
-#Adjusting configure flags for Clang on Lion (ticket #34545)
-platform darwin 11 {
-    patchfiles-append       patch-declarationbuilder.diff patch-context.diff
-    configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal -stdlib=libc++"
-}
-
 notes " Please run ${prefix}/bin/kbuildsycoca4    
  command after installing kdevelop."
 

Modified: trunk/dports/kde/kdevplatform/Portfile
===================================================================
--- trunk/dports/kde/kdevplatform/Portfile	2012-06-19 12:02:15 UTC (rev 94442)
+++ trunk/dports/kde/kdevplatform/Portfile	2012-06-19 14:14:53 UTC (rev 94443)
@@ -33,19 +33,18 @@
 depends_lib-append  port:kdelibs4 \
                     port:boost
 
-platform darwin 10 {
-    #Adjusting flags for clang on SL and 
-    #patching <unordered_map> (ticket #34859)
-    if {${configure.compiler} == "clang"} {
-        patchfiles-append       patch-modificationrevision.diff
+#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++"
+    } else {
+        #Patching code for clang on SL where libc++ is not available (ticket #34859)
         configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal"
+        patchfiles-append       patch-modificationrevision.diff
     }
 }
 
-#Adjusting configure flags for Clang on Lion (ticket #34545)
-platform darwin 11 {
-    configure.args-append   -DCMAKE_CXX_FLAGS="-Wno-reserved-user-defined-literal -stdlib=libc++"
-}
 
 livecheck.url       http://kde.mirrors.hoobly.com/stable/kdevelop/${kdevelopversion}/src
 livecheck.regex     ${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120619/e7462878/attachment.html>