[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/10: gnu: hdf4: Provide an absolute reference to libjpeg.
From: |
guix-commits |
Subject: |
01/10: gnu: hdf4: Provide an absolute reference to libjpeg. |
Date: |
Wed, 27 May 2020 15:52:55 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit fadd962f4b7aa5a5a26a3efa705a359e29f60fc5
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed May 27 14:50:01 2020 +0200
gnu: hdf4: Provide an absolute reference to libjpeg.
* gnu/packages/maths.scm (hdf4)[arguments]: Add phase
'provide-absolute-libjpeg-reference'.
---
gnu/packages/maths.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 76e9eac..8e35188 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -920,7 +920,17 @@ computations.")
(("(/gnu/store/)([a-Z0-9]*)" all prefix hash)
(string-append prefix (string-take hash 10) "...")))
#t))
- )))
+ (add-after 'install 'provide-absolute-libjpeg-reference
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (libjpeg (assoc-ref inputs "libjpeg")))
+ ;; libjpeg-turbo does not provide a .la file, so libtool is
+ ;; unable to add an absolute reference for -ljpeg in the .la
+ ;; files. Fix it manually to avoid having to propagate it.
+ (substitute* (find-files (string-append out "/lib") "\\.la$")
+ (("-ljpeg")
+ (string-append "-L" libjpeg "/lib -ljpeg")))
+ #t))))))
(home-page "https://www.hdfgroup.org/products/hdf4/")
(synopsis
"Library and multi-object file format for storing and managing data")
- branch master updated (db38840 -> ef64f9c), guix-commits, 2020/05/27
- 01/10: gnu: hdf4: Provide an absolute reference to libjpeg.,
guix-commits <=
- 02/10: gnu: Add ruby-ptools., guix-commits, 2020/05/27
- 03/10: gnu: Add ruby-mkmf-lite., guix-commits, 2020/05/27
- 04/10: gnu: Add ruby-sys-filesystem., guix-commits, 2020/05/27
- 05/10: gnu: ruby-thor: Update to 1.0.1., guix-commits, 2020/05/27
- 09/10: gnu: Add Universal Ctags., guix-commits, 2020/05/27
- 06/10: gnu: Add facter., guix-commits, 2020/05/27
- 08/10: gnu: Add packcc., guix-commits, 2020/05/27
- 10/10: gnu: jucipp: Update to 1.6.0., guix-commits, 2020/05/27
- 07/10: gnu: code.scm: Sort module imports., guix-commits, 2020/05/27