[126425] trunk/dports/devel/akonadi

[nicos at macports.org]

Revision: 126425
          https://trac.macports.org/changeset/126425
Author:   nicos at macports.org
Date:     2014-10-09 18:31:30 -0700 (Thu, 09 Oct 2014)
Log Message:
-----------
akonadi: fix build on older systems without full C11++ support

Modified Paths:
--------------
    trunk/dports/devel/akonadi/Portfile

Added Paths:
-----------
    trunk/dports/devel/akonadi/files/patch-tests.diff

Modified: trunk/dports/devel/akonadi/Portfile
===================================================================
--- trunk/dports/devel/akonadi/Portfile	2014-10-09 23:35:26 UTC (rev 126424)
+++ trunk/dports/devel/akonadi/Portfile	2014-10-10 01:31:30 UTC (rev 126425)
@@ -187,11 +187,18 @@
 	reinplace "s|/Applications|${applications_dir}|" ${worksrcpath}/CMakeLists.txt
 }
 
-platform darwin 9 {
-    if {[info exists universal_target] && ${universal_target} == "10.4"} {
-# Needed if compiling for 10.4 universal on 10.5
-        post-configure {
-            reinplace "s|#define HAVE_EXECINFO_H 1||" ${workpath}/build/config-akonadi.h
+platform darwin {
+    if {${os.major} < 13} {
+        #Deactivate tests for 10.8 and lower, as they require full C++11 support (ticket #45300)
+        patchfiles-append     patch-tests.diff
+        configure.args-append -DAKONADI_BUILD_TESTS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF
+    }
+    if {${os.major} == 9} {
+        if {[info exists universal_target] && ${universal_target} == "10.4"} {
+        # Needed if compiling for 10.4 universal on 10.5
+            post-configure {
+                reinplace "s|#define HAVE_EXECINFO_H 1||" ${workpath}/build/config-akonadi.h
+            }
         }
     }
 }

Added: trunk/dports/devel/akonadi/files/patch-tests.diff
===================================================================
--- trunk/dports/devel/akonadi/files/patch-tests.diff	                        (rev 0)
+++ trunk/dports/devel/akonadi/files/patch-tests.diff	2014-10-10 01:31:30 UTC (rev 126425)
@@ -0,0 +1,24 @@
+--- server/CMakeLists.txt.orig	2014-08-10 19:38:58.000000000 +0900
++++ server/CMakeLists.txt	2014-10-10 10:24:15.000000000 +0900
+@@ -27,7 +27,9 @@
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/handler)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/nepomuk)
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/tests)
++if(AKONADI_BUILD_TESTS AND BUILD_TESTING) 
++  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/tests) 
++endif(AKONADI_BUILD_TESTS AND BUILD_TESTING)
+ include_directories(${Akonadi_SOURCE_DIR}/shared)
+ if(Soprano_FOUND)
+   include_directories(${SOPRANO_INCLUDE_DIR})
+@@ -64,7 +66,9 @@
+ add_subdirectory(akonadictl)
+ add_subdirectory(control)
+ add_subdirectory(src)
+-add_subdirectory(tests)
++if(AKONADI_BUILD_TESTS AND BUILD_TESTING) 
++  add_subdirectory(tests) 
++endif(AKONADI_BUILD_TESTS AND BUILD_TESTING) 
+ 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_ENABLE_EXCEPTIONS}")
+ if(MYSQLD_EXECUTABLE)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141009/a34b030b/attachment.html>