nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Mark H Weaver 2018-04-14 15:10:54 -04:00
parent 53e66fbceb
commit c97f2f70fe
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/gnome.scm
View File

@ -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 ";"))