[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: hdf-java: Fix build.
From: |
guix-commits |
Subject: |
02/02: gnu: hdf-java: Fix build. |
Date: |
Wed, 27 Mar 2019 05:14:57 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit 64dc8b0bfd1cd2ab473ef23c06dde02dd4353cf5
Author: Ricardo Wurmus <address@hidden>
Date: Wed Mar 27 10:13:46 2019 +0100
gnu: hdf-java: Fix build.
* gnu/packages/maths.scm (hdf-java)[arguments]: Fix copying from automake;
substitute embedded hdf5 version number.
---
gnu/packages/maths.scm | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 6dbb702..6ebc82a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -953,10 +953,19 @@ extremely large and complex data collections.")
;; Replace outdated config.sub and config.guess:
(with-directory-excursion "config"
(for-each (lambda (file)
- (copy-file
+ (install-file
(string-append (assoc-ref inputs "automake")
- "/share/automake-1.15/" file) file))
+ "/share/automake-"
+ ,(version-major+minor
(package-version automake))
+ "/" file) "."))
'("config.sub" "config.guess")))
+
+ ;; Fix embedded version number
+ (let ((hdf5version (list ,@(string-split (package-version hdf5)
#\.))))
+ (substitute* "hdf/hdf5lib/H5.java"
+ (("1, 8, 19")
+ (string-join hdf5version ", "))))
+
(mkdir-p (string-append (assoc-ref outputs "out")))
;; Set classpath for tests
(let* ((build-dir (getcwd))