From patchwork Mon Jul 8 09:59:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 14530 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AEDCC171D4; Mon, 8 Jul 2019 11:04:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 70653171D2 for ; Mon, 8 Jul 2019 11:04:47 +0100 (BST) Received: from localhost ([::1]:40064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQVq-0007CD-2y for patchwork@mira.cbaines.net; Mon, 08 Jul 2019 06:04:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55100) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRc-0005fY-Pd for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkQRb-0003Hg-GF for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:24 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49070) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkQRb-0003HW-B4 for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:23 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkQRb-0004wM-8B for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:23 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH 25/31] gnu: libarchive: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jul 2019 10:00:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36477 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36477@debbugs.gnu.org Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.156257999918699 (code B ref 36477); Mon, 08 Jul 2019 10:00:23 +0000 Received: (at 36477) by debbugs.gnu.org; 8 Jul 2019 09:59:59 +0000 Received: from localhost ([127.0.0.1]:57850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQRD-0004rQ-B4 for submit@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:59 -0400 Received: from mail-wr1-f50.google.com ([209.85.221.50]:38317) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQR5-0004oA-7a for 36477@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:51 -0400 Received: by mail-wr1-f50.google.com with SMTP id g17so6190278wrr.5 for <36477@debbugs.gnu.org>; Mon, 08 Jul 2019 02:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UZlUgCFBzUEhX+iQcNNYWh2PANgmcnxnd2WotguWy1U=; b=M7bdiXhf0oID3bNm69QIGM8dq8FpCRxgfTenj8bakDLbz9dydt2xmnRoa4lH7Z6tl6 xPM2aiFyA/I9nssabOInJ/lKznEva6UnsGbcFufUCW2fBAb/jvcFgG6vCKy9fapbWjUI zDKZZutwUiynFX2F7++SdraGVqqvv5TATqWiwYnO07GDDZJsBgdyE9oANfepCVxiuesv f9hPNWQPZ3VpzpJJS6BEqSp0M7/Cymcu5fol1D+wexCVxKF85f41dUkQHprQPZ1jNWA7 eamAUpdqFVNgqd9za39+PMXzTkE9y0+esuvZqBbP1G/JDGjmd8lLy3e8gCYZnCfb/o/7 ESJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UZlUgCFBzUEhX+iQcNNYWh2PANgmcnxnd2WotguWy1U=; b=sLBUiDB+UGcpb9SmoRtzxXPmBXHquBreIi9g10w/mkJMpQKAnJQZOU6RyllQSiomoL eNzoLK2awkSIwTSq2DmwbqM4kQYI8Z1h10W2mkWnUNKDRPXOzNcf/qxwdPdzwICDUEFO LJ4d0+8T4feBEPaHEhmSugZB+RFOsuDRtpKT9cEsb51m4qtj0H1VRspPCSQGDmRFi1th /7fvljZ8z8vS7353pk1kleHxky4MNAVWnpWuS+SAJ5uudA7xU5P0ZYcNa4+m3L6O7HQr +arn/+xjF1Z10wZXhOVaJY93H7iIShPAEIL1ZRthkqZ090lFwtWKM67mw2b57uk6n7RH vrBA== X-Gm-Message-State: APjAAAUwJHfWgR6e+br52b/gepFkjF18tkXskd0uWTLhRWytGXQc2jIM fU5P5glSqE1yUb0XmsQ0XYvTegjt X-Google-Smtp-Source: APXvYqxDpTCMVfhp6UlvW3O3ZjMrjM3wybfqr2uW86qId/kc1D2tzEHsxAaENXbNJSOt7vlX0qOOvQ== X-Received: by 2002:a5d:56d0:: with SMTP id m16mr17392429wrw.276.1562579985097; Mon, 08 Jul 2019 02:59:45 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id i66sm3165127wmi.11.2019.07.08.02.59.44 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 02:59:44 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 8 Jul 2019 11:59:07 +0200 Message-Id: <20190708095913.3460-26-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190708095913.3460-1-m.othacehe@gmail.com> References: <20190708095913.3460-1-m.othacehe@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mathieu Othacehe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/backup.scm (libarchive)[arguments]: Do not build and run tests when cross-compiling. --- gnu/packages/backup.scm | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 0bd894f958..783ca7a674 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Alex Vong +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -226,17 +227,25 @@ backups (called chunks) to allow easy burning to CD/DVD.") (("/bin/pwd") (which "pwd"))) #t)) (replace 'check - (lambda _ - ;; XXX: The test_owner_parse, test_read_disk, and - ;; test_write_disk_lookup tests expect user 'root' to exist, but - ;; the chroot's /etc/passwd doesn't have it. Turn off those tests. - ;; - ;; The tests allow one to disable tests matching a globbing pattern. - (invoke "make" "libarchive_test" "bsdcpio_test" "bsdtar_test") - ;; XXX: This glob disables too much. - (invoke "./libarchive_test" "^test_*_disk*") - (invoke "./bsdcpio_test" "^test_owner_parse") - (invoke "./bsdtar_test"))) + ,@(if (%current-target-system) + '((lambda _ + #t)) + '((lambda _ + ;; XXX: The test_owner_parse, test_read_disk, and + ;; test_write_disk_lookup tests expect user 'root' to + ;; exist, but the chroot's /etc/passwd doesn't have it. + ;; Turn off those tests. + ;; + ;; The tests allow one to disable tests matching a + ;; globbing pattern. + (invoke "make" + "libarchive_test" + "bsdcpio_test" + "bsdtar_test") + ;; XXX: This glob disables too much. + (invoke "./libarchive_test" "^test_*_disk*") + (invoke "./bsdcpio_test" "^test_owner_parse") + (invoke "./bsdtar_test"))))) (add-after 'install 'add--L-in-libarchive-pc (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))