From 2bd84c50ff7a8dafe83b6aa89cd0f01d5282c621 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 26 Jul 2020 23:55:01 -0400 Subject: 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(-) create mode 100644 gnu/packages/patches/plotutils-spline-test.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index e574697f32..8274e158d0 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 0000000000..2f9feb96cf --- /dev/null +++ b/gnu/packages/patches/plotutils-spline-test.patch @@ -0,0 +1,34 @@ +Description: Work around i386 testsuite error +Author: Andreas Metzler +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 8ddc8ebc74..1e182fbb51 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"))) -- cgit v1.2.3 es/docker.scm?id=b8e7e20841285c862c684a864a23545489cb9227'>gnu: docker: Add support for tini....Maxim Cournoyer 2019-09-05gnu: Add tini....Maxim Cournoyer 2019-08-05gnu: docker-compose: Remove inputs for old Python versions....Tobias Geerinckx-Rice 2019-08-05gnu: python-docker-py: Propagate dependencies....Tobias Geerinckx-Rice 2019-08-05gnu: docker-compose: Remove Windows-specific input....Tobias Geerinckx-Rice 2019-08-04gnu: docker-cli: Print a usable version string....Marius Bakke 2019-07-13gnu: docker-compose: Update to 1.24.1....Jacob MacDonald 2019-07-13gnu: python-docker-py: Update to 3.7.3....Jacob MacDonald 2019-07-13gnu: python-dockerpty: Update to 0.4.1....Jacob MacDonald 2019-07-13gnu: python-docker-pycreds: Update to 0.4.0....Jacob MacDonald 2019-06-16gnu: docker-compose: Add required Python dependencies....Tobias Geerinckx-Rice 2019-05-13gnu: cqfd: Update to 5.1.0....Maxim Cournoyer 2019-05-05gnu: docker: Refer to xz by its absolute path....Maxim Cournoyer 2019-05-05gnu: docker: Patch the reference to the docker proxy....Maxim Cournoyer 2019-05-05gnu: docker: Optimize substitution macros....Maxim Cournoyer 2019-05-05gnu: docker: Make macros use a relative path as argument....Maxim Cournoyer 2019-05-05gnu: docker: Harmonize LookPath regexes....Maxim Cournoyer 2019-05-05gnu: docker: Cleanup extraneous comments....Maxim Cournoyer 2019-05-05gnu: docker: Fix indentation....Maxim Cournoyer 2019-05-05gnu: Add docker-libnetwork-cmd-proxy....Maxim Cournoyer 2019-05-05gnu: Add docker-libnetwork....Maxim Cournoyer 2019-04-16gnu: docker, docker-cli: Update to 18.09.5....Tobias Geerinckx-Rice 2019-03-25gnu: docker: Use fewer modprobes....Danny Milosavljevic 2019-03-14gnu: containerd: Update to 1.2.5....Tobias Geerinckx-Rice 2019-03-14gnu: docker, docker-cli: Update to 18.09.3....Tobias Geerinckx-Rice 2019-03-14build-system/go: Build with a filesystem union of Go dependencies....Leo Famulari 2019-02-19gnu: containerd: Update to 1.2.4....Tobias Geerinckx-Rice 2019-02-19gnu: docker: Fix build on btrfs....Tobias Geerinckx-Rice 2019-02-12gnu: Docker: Update to 18.09.2....Leo Famulari 2019-02-05gnu: Add cqfd....Maxim Cournoyer 2019-02-04gnu: containerd: Update to 1.2.2....Tobias Geerinckx-Rice 2019-02-04gnu: docker-cli: Use HTTPS home page....Tobias Geerinckx-Rice 2019-01-15gnu: Separate Python core packages from the rest....Ricardo Wurmus 2019-01-15gnu: docker-cli: Don't install the same executable twice....Danny Milosavljevic 2019-01-10gnu: docker: Booby-trap "Command" and "LookPath" calls....Danny Milosavljevic 2019-01-10gnu: docker: Fix more paths....Danny Milosavljevic 2019-01-10gnu: docker: Disable tests requiring elevated permissions....Danny Milosavljevic 2019-01-10gnu: containerd: Fix more paths....Danny Milosavljevic 2019-01-10gnu: docker: Fix more paths....Danny Milosavljevic 2019-01-10gnu: docker: Substitute LookPath of literals generally....Danny Milosavljevic 2019-01-10gnu: Add docker-cli....Danny Milosavljevic 2019-01-10gnu: Add docker....Danny Milosavljevic 2019-01-07gnu: containerd: Update synopsis....Danny Milosavljevic 2019-01-07gnu: containerd: Enable tests....Danny Milosavljevic 2019-01-07gnu: Add missing use-module clause....Ricardo Wurmus 2019-01-07gnu: Add containerd....Danny Milosavljevic 2018-07-29gnu: python-docker-py: Update to 1.10.6....Efraim Flashner 2018-07-29gnu: Add python-docker-pycreds....Efraim Flashner