branch master updated: gnu: plotutils: Fix build on non-x86_64 architectures.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 2bd84c5  gnu: plotutils: Fix build on non-x86_64 architectures.
2bd84c5 is described below

commit 2bd84c50ff7a8dafe83b6aa89cd0f01d5282c621
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jul 26 23:55:01 2020 -0400

    gnu: plotutils: Fix build on non-x86_64 architectures.
    
    * gnu/packages/patches/plotutils-spline-test.patch: Add patch.
    * gnu/local.mk (dist_patch_DATA): Register it.
    * gnu/packages/plotutils.scm (plotutils)[patches]: Apply it.
---
 gnu/local.mk                                     |  1 +
 gnu/packages/patches/plotutils-spline-test.patch | 34 ++++++++++++++++++++++++
 gnu/packages/plotutils.scm                       |  7 ++++-
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index e574697..8274e15 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1408,6 +1408,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/plink-endian-detection.patch            \
   %D%/packages/patches/plib-CVE-2011-4620.patch                \
   %D%/packages/patches/plib-CVE-2012-4552.patch                \
+  %D%/packages/patches/plotutils-spline-test.patch             \
   %D%/packages/patches/podofo-cmake-3.12.patch                 \
   %D%/packages/patches/portaudio-audacity-compat.patch         \
   %D%/packages/patches/portmidi-modular-build.patch            \
diff --git a/gnu/packages/patches/plotutils-spline-test.patch 
b/gnu/packages/patches/plotutils-spline-test.patch
new file mode 100644
index 0000000..2f9feb9
--- /dev/null
+++ b/gnu/packages/patches/plotutils-spline-test.patch
@@ -0,0 +1,34 @@
+Description: Work around i386 testsuite error
+Author: Andreas Metzler <ametzler@debian.org>
+Origin: vendor
+Bug: http://lists.gnu.org/archive/html/bug-plotutils/2017-02/msg00001.html
+Bug-Debian: https://bugs.debian.org/856134
+Forwarded: 
http://lists.gnu.org/archive/html/bug-plotutils/2017-02/msg00002.html
+Last-Update: 2017-02-25
+
+--- a/test/spline.test
++++ b/test/spline.test
+@@ -3,12 +3,21 @@
+ echo 0 1 0.5 0.75 -0.25 0 | ../spline/spline -a -T 1 -n 120 \
+       --precision 5 -p >spline.out
+ 
++# Work around testsuite error
++# http://lists.gnu.org/archive/html/bug-plotutils/2016-04/msg00000.html
++#
+ # work around line end problems in installations with DJGPP under DOS
+-tr -d '\015' < spline.out > spline.dos
++tr -d '\015' < spline.out \
++      | head -n 120 | tail -n 119 \
++      > spline.dos
+ 
+-if cmp -s $SRCDIR/spline.xout spline.dos
++# cannot patch spline.xout, it is used as input for graph.test.
++head -n 120 $SRCDIR/spline.xout | tail -n 119 > spline.xout.4comp
++
++if cmp -s spline.xout.4comp spline.dos
+       then retval=0;
+       else retval=1;
+       fi;
+ 
++rm -f spline.xout.4comp
+ exit $retval
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 8ddc8eb..1e182fb 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -73,7 +73,12 @@
                  (substitute* "libplot/z_write.c"
                    (("png_ptr->jmpbuf")
                     "png_jmpbuf (png_ptr)"))
-                 #t))))
+                 #t))
+             (patches
+              ;; The test suite fails on some architectures such as i686 (see:
+              ;; 
https://lists.gnu.org/archive/html/bug-plotutils/2016-04/msg00002.html).
+              ;; The following Debian patch works around it.
+              (search-patches "plotutils-spline-test.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags (list "--enable-libplotter")))