;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
(define-module (gnu packages icu4c)
#:use-module (gnu packages)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages python)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system ant)
#:use-module (guix build-system gnu))
+;; These patches are taken from ICUs 'maint-64' branch and will be included in
+;; 64.3. The latter patch is needed because many packages use "invalid"
+;; locales which misbehave with ICU 64.2. See discussion at
+;; <https://lists.gnu.org/archive/html/guix-devel/2019-07/msg00343.html>.
+(define %icu4c-patches
+ (list (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/unicode-org/icu/commit/"
+ "7788f04eb9be0d7ecade6af46cf7b9825447763d.patch"))
+ (file-name "icu4c-datetime-regression.patch")
+ (sha256
+ (base32
+ "0gs2sbdfpzwwdjqcqr0c16fw3g7wy3gb1gbgvzs9k1ciw0bhpv4w")))
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/unicode-org/icu/commit/"
+ "cfb20862909ff105d4f2c43923c97561bc5a5815.patch"))
+ (file-name "icu4c-locale-mapping.patch")
+ (sha256
+ (base32
+ "0s5psb60aisj6icziblvlp9dqcz56n3887i8ib0yidbjnnrw5b97")))))
+
(define-public icu4c
(package
(name "icu4c")
- (version "62.1")
+ (version "64.2")
(source (origin
(method url-fetch)
(uri (string-append
"/icu4c-"
(string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
"-src.tgz"))
+ (patches %icu4c-patches)
+ (patch-flags '("-p2"))
(sha256
- (base32 "18ssgnwzzpm1g1fvbm9h1fvryiwxvvn5wc3fdakdsl33cs6qdn9x"))))
+ (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2"))))
(build-system gnu-build-system)
+ (native-inputs
+ `(("python" ,python-minimal)))
(inputs
`(("perl" ,perl)))
(arguments
`(#:configure-flags
- '("--enable-rpath"
- ,@(if (let ((s (or (%current-target-system)
- (%current-system))))
- (or (string-prefix? "arm" s)
- (string-prefix? "mips" s)))
- '("--with-data-packaging=archive")
- '()))
- ,@(if (string-prefix? "i686" (or (%current-target-system)
- (%current-system)))
- ;; FIXME: Some tests are failing on i686:
- ;; <https://unicode-org.atlassian.net/browse/ICU-20080>.
- '(#:tests? #f)
- '())
+ '("--enable-rpath")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'chdir-to-source
(lambda _ (chdir "source") #t))
+ (add-after 'chdir-to-source 'update-LDFLAGS
+ (lambda _
+ ;; Do not create a "data-only" libicudata.so because it causes
+ ;; problems on some architectures (notably armhf and MIPS).
+ (substitute* "config/mh-linux"
+ (("LDFLAGSICUDT=-nodefaultlibs -nostdlib")
+ "LDFLAGSICUDT="))
+ #t))
(add-after 'install 'avoid-coreutils-reference
;; Don't keep a reference to the build tools.
(lambda* (#:key outputs #:allow-other-keys)