guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: netpbm: Fix build on powerpc-linux.


From: guix-commits
Subject: branch master updated: gnu: netpbm: Fix build on powerpc-linux.
Date: Tue, 09 Apr 2024 13:57:54 -0400

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

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 9a1abc1352 gnu: netpbm: Fix build on powerpc-linux.
9a1abc1352 is described below

commit 9a1abc1352b772e7062a170083344f4803280979
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Apr 9 12:03:34 2024 +0300

    gnu: netpbm: Fix build on powerpc-linux.
    
    * gnu/packages/netpbm.scm (netpbm)[arguments]: Adjust the 'setup-check
    phase to skip 2 tests when building for powerpc-linux.
    
    Change-Id: Ie8f23bed0f5d442df3a19e227bbdc3a17fa77511
---
 gnu/packages/netpbm.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm
index 489a3c7a43..ce00df9479 100644
--- a/gnu/packages/netpbm.scm
+++ b/gnu/packages/netpbm.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015, 2016, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,7 +33,8 @@
   #:use-module (guix build-system gnu)
   #:use-module ((guix licenses) #:select (gpl2))
   #:use-module (guix packages)
-  #:use-module (guix svn-download))
+  #:use-module (guix svn-download)
+  #:use-module (guix utils))
 
 (define-public netpbm
   (package
@@ -158,6 +160,12 @@
              (("pnmremap1.test") "")
              (("gif-roundtrip.test") "")
 
+             ;; These two tests fail on powerpc-linux.
+             ,@(if (target-ppc32?)
+                   `((("pbmtog3\\.test") "")
+                     (("g3-roundtrip\\.test") ""))
+                   '())
+
              ;; These two tests started failing in netpbm-10.78.3.
              (("jpeg-roundtrip.test") "")
              (("pbmtext.test") "")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]