;;; 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, 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
+;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
;;;
;;; This file is part of GNU Guix.
;;;
(define-module (gnu packages icu4c)
#:use-module (gnu packages)
+ #:use-module (gnu packages java)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages python)
#:use-module (guix licenses)
#:use-module (guix packages)
+ #:use-module (guix utils)
#:use-module (guix download)
#:use-module (guix build-system ant)
#:use-module (guix build-system gnu))
(define-public icu4c
(package
(name "icu4c")
- (version "63.1")
+ (version "66.1")
(source (origin
(method url-fetch)
(uri (string-append
- "http://download.icu-project.org/files/icu4c/"
- version
+ "https://github.com/unicode-org/icu/releases/download/release-"
+ (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
"/icu4c-"
(string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
"-src.tgz"))
+ (patch-flags '("-p2"))
+ (patches (search-patches "icu4c-CVE-2020-10531.patch"))
(sha256
- (base32 "17fbk0lm2clsxbmjzvyp245ayx0n4chji3ky1f3fbz2ljjv91i05"))))
+ (base32 "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj"))))
(build-system gnu-build-system)
+ ;; When cross-compiling, this package needs a source directory of a
+ ;; native-build of itself.
+ (native-inputs
+ `(("python" ,python-minimal)
+ ,@(if (%current-target-system)
+ `(("icu4c-build-root" ,icu4c-build-root))
+ '())))
(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")
+ (list
+ "--enable-rpath"
+ ,@(if (%current-target-system)
+ '((string-append "--with-cross-build="
+ (assoc-ref %build-inputs "icu4c-build-root")))
'()))
- ,@(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)
- '())
#: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)
(license x11)
(home-page "http://site.icu-project.org/")))
+(define-public icu4c-67
+ (package
+ (inherit icu4c)
+ (version "67.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/unicode-org/icu/releases/download/release-"
+ (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
+ "/icu4c-"
+ (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
+ "-src.tgz"))
+ (sha256
+ (base32
+ "1p6mhvxl0xr2n0g6xdps3mwzwlv6mjsz3xlpm793p9aiybb0ra4l"))))))
+
+(define-public icu4c-build-root
+ (package
+ (inherit icu4c)
+ (name "icu4c-build-root")
+ (arguments
+ (substitute-keyword-arguments (package-arguments icu4c)
+ ((#:tests? _ '())
+ #f)
+ ((#:out-of-source? _ '())
+ #t)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (copy-recursively "../build" out)
+ #t)))))))
+ (native-inputs '())))
+
(define-public java-icu4j
(package
(name "java-icu4j")
- (version "59.1")
+ (version "66.1")
(source (origin
(method url-fetch)
- (uri (string-append "http://download.icu-project.org/files/icu4j/"
- version "/icu4j-"
- (string-map (lambda (x)
- (if (char=? x #\.) #\_ x))
- version)
- "-src.jar"))
+ (uri (string-append
+ "https://github.com/unicode-org/icu/releases/download/release-"
+ (string-map (lambda (x) (if (char=? x #\.) #\- x)) version)
+ "/icu4j-"
+ (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version)
+ ".tgz"))
(sha256
- (base32
- "0bgxsvgi0qcwj60pvcxrf7a3fbk7aksyxnfwpbzavyfrfzixqh0c"))))
+ (base32 "1ahdyz9209lwl7knb2l3gmnkkby221p0vpgx70fj4j02rdzgvw0d"))))
(build-system ant-build-system)
(arguments
- `(#:tests? #f ; no tests included
- #:jar-name "icu4j.jar"))
+ `(#:make-flags
+ (list (string-append "-Djunit.core.jar="
+ (car (find-files
+ (assoc-ref %build-inputs "java-junit")
+ ".*.jar$")))
+ (string-append "-Djunit.junitparams.jar="
+ (car (find-files
+ (assoc-ref %build-inputs "java-junitparams")
+ ".*.jar$")))
+ (string-append "-Djunit.hamcrest.jar="
+ (car (find-files
+ (assoc-ref %build-inputs "java-hamcrest-core")
+ ".*.jar$"))))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+ (lambda _
+ (chdir "..")
+ #t))
+ (add-before 'build 'remove-ivy
+ (lambda _
+ ;; This target wants to download ivy and use it to download
+ ;; junit.
+ (substitute* "build.xml"
+ (("depends=\"test-init-junit-dependency\"") ""))
+ #t))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((share (string-append (assoc-ref outputs "out")
+ "/share/java/")))
+ (mkdir-p share)
+ (install-file "icu4j.jar" share)
+ #t))))))
+ (native-inputs
+ `(("java-junit" ,java-junit)
+ ("java-junitparams" ,java-junitparams)
+ ("java-hamcrest-core" ,java-hamcrest-core)))
(home-page "http://site.icu-project.org/")
(synopsis "International Components for Unicode")
(description
HCoop / jackhill / guix / guix.git / blobdiff