summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2016-10-18 21:15:43 +0200
committerAndreas Enge <andreas@enge.fr>2016-10-18 21:15:43 +0200
commit15ca49b220b531864b9ac4d3dcbb218279ca0db3 (patch)
treebf4a20f28612c4d0af3b3fb6ab6fd2ab8dd24791
parent1dc30f92320c5e1b528a7eec2b0a4ce529f70c56 (diff)
downloadguix-15ca49b220b531864b9ac4d3dcbb218279ca0db3.tar.gz
gnu: hdf4: Really fix non-x86 architectures.
This is a follow-up to commit 60da9fb1100787c49ed4910eacf50e83c6462dcc.

* gnu/local.mk (dist_patch_DATA): Register patch.
* gnu/packages/maths.scm (hdf4)[source]: Add patch.
-rw-r--r--gnu/local.mk3
-rw-r--r--gnu/packages/maths.scm3
2 files changed, 4 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 5226b49def..73221b870c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -584,8 +584,9 @@ dist_patch_DATA =						\
   %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch	\
   %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
   %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
-  %D%/packages/patches/hdf4-shared-fortran.patch 		\
+  %D%/packages/patches/hdf4-architectures.patch 		\
   %D%/packages/patches/hdf4-reproducibility.patch 		\
+  %D%/packages/patches/hdf4-shared-fortran.patch 		\
   %D%/packages/patches/hdf5-config-date.patch			\
   %D%/packages/patches/hdf-eos5-build-shared.patch 		\
   %D%/packages/patches/hdf-eos5-remove-gctp.patch		\
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 07934e3114..d41a3f11bf 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -456,7 +456,8 @@ computations.")
                            version "/src/hdf-" version ".tar.bz2"))
        (sha256
         (base32 "16yr50j845zlfx20skmw3y75ww77akk9gg0affjqkg66ih5r03mv"))
-       (patches (search-patches "hdf4-reproducibility.patch"
+       (patches (search-patches "hdf4-architectures.patch"
+                                "hdf4-reproducibility.patch"
                                 "hdf4-shared-fortran.patch"))))
 
     (build-system gnu-build-system)