[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: evolution-data-server: Fix build with ICU 61.
|
From: |
Mark H. Weaver |
|
Subject: |
01/02: gnu: evolution-data-server: Fix build with ICU 61. |
|
Date: |
Sat, 14 Apr 2018 16:34:14 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit c97f2f70fe876030ab5e304d57fbc30033f86daa
Author: Mark H Weaver <address@hidden>
Date: Sat Apr 14 15:10:54 2018 -0400
gnu: evolution-data-server: Fix build with ICU 61.
* gnu/packages/gnome.scm (evolution-data-server)[arguments]: In the
configure
flags, add "-DU_USING_ICU_NAMESPACE=1" to CMAKE_CXX_FLAGS.
---
gnu/packages/gnome.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 21e0f3d..8861f26 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4907,8 +4907,12 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
"-DENABLE_GOOGLE_AUTH=OFF" ;disable Google authentication
"-DENABLE_VALA_BINDINGS=ON"
;; FIXME: Building against ICU 60 requires C++11 or higher.
Remove
- ;; this when our default compiler is >= GCC6.
- "-DCMAKE_CXX_FLAGS=-std=gnu++11"
+ ;; "-std=gnu++11" when our default compiler is >= GCC6.
+ ;; FIXME: Temporarily use "-DU_USING_ICU_NAMESPACE=1" until
+ ;; evolution-data-server has been updated to qualify ICU types
+ ;; explicitly, as required by ICU 61 and later. See:
+ ;;
<https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild>
+ "-DCMAKE_CXX_FLAGS=-std=gnu++11 -DU_USING_ICU_NAMESPACE=1"
(string-append "-DCMAKE_INSTALL_RPATH=" lib ";"
(string-append lib "/evolution-data-server;")
(string-join runpaths ";"))