summary refs log tree commit diff
path: root/gnu/local.mk
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-06-18 01:49:47 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-06-18 02:25:49 -0400
commit620796e66bb828ca22b5d4932275bc36a7b4706a (patch)
treed8a26b358cd367c7bfce8ce3c82d78ffa8a676a1 /gnu/local.mk
parentc7c7e115d0cd20b0af0df90d34a93270c79d55be (diff)
downloadguix-620796e66bb828ca22b5d4932275bc36a7b4706a.tar.gz
gnu: lib2geom: Fix tests on aarch64, i686-linux architectures.
Fixes <http://issues.guix.gnu.org/41827>.

This change also removes obsolete patches.

* gnu/packages/patches/lib2geom-fix-tests.patch: New file.
* gnu/packages/patches/lib2geom-link-tests-against-glib.patch: Delete file.
* gnu/packages/patches/lib2geom-use-system-googletest.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/graphics.scm (lib2geom)[origin]: Use new patch.
Diffstat (limited to 'gnu/local.mk')
-rw-r--r--gnu/local.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 8b33c23f6d..fd3cc88af5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1161,8 +1161,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/leela-zero-gtest.patch			\
   %D%/packages/patches/less-hurd-path-max.patch			\
   %D%/packages/patches/lib2geom-enable-assertions.patch		\
-  %D%/packages/patches/lib2geom-link-tests-against-glib.patch	\
-  %D%/packages/patches/lib2geom-use-system-googletest.patch	\
+  %D%/packages/patches/lib2geom-fix-tests.patch			\
   %D%/packages/patches/liba52-enable-pic.patch			\
   %D%/packages/patches/liba52-link-with-libm.patch		\
   %D%/packages/patches/liba52-set-soname.patch			\