From patchwork Tue Apr 26 12:46:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 38911 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 542EC27BBEA; Tue, 26 Apr 2022 13:56:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2317927BBE9 for ; Tue, 26 Apr 2022 13:56:49 +0100 (BST) Received: from localhost ([::1]:45676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njKkK-000833-8g for patchwork@mira.cbaines.net; Tue, 26 Apr 2022 08:56:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njKax-0007De-Us for guix-patches@gnu.org; Tue, 26 Apr 2022 08:47:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43667) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njKax-0007Vq-ML for guix-patches@gnu.org; Tue, 26 Apr 2022 08:47:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1njKax-0004nS-JQ for guix-patches@gnu.org; Tue, 26 Apr 2022 08:47:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55125] [PATCH 8/9] gnu: vcflib: Find submodule sources in native-inputs during cross-compilation. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 26 Apr 2022 12:47:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55125 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55125@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 55125-submit@debbugs.gnu.org id=B55125.165097721617910 (code B ref 55125); Tue, 26 Apr 2022 12:47:07 +0000 Received: (at 55125) by debbugs.gnu.org; 26 Apr 2022 12:46:56 +0000 Received: from localhost ([127.0.0.1]:37553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1njKam-0004eQ-A9 for submit@debbugs.gnu.org; Tue, 26 Apr 2022 08:46:56 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:36288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1njKah-0004ZF-KH for 55125@debbugs.gnu.org; Tue, 26 Apr 2022 08:46:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=znplA+xDzJbWw2etPp8FbD5B6HfABIe/ZHX4GlC2UwE=; b=FSHOPYDiiO09rSi85Vq3v7nC8o PIBrCikPt92GLo+SA2z+bMXgbZXQYY5gWOd9H5a6p4FsCV6avNGUPEGkjgvC8PoR21CThEHGORlkq 1F68ZMYpPuTLjQsz3uYOjEQavewMaDOdX27/y4xrgC4kDTo+KM4MXLoSW/aWqbLxul1kLI4IVy1in dOfDEgu5+lPXhE8BavHSlad+upDwGiMRamfgkuyE3CyW600Bud0yZU9FKd2kPsgoIn7F7ymn6nIKX fy1g0EUMLEtcW7M5SIsge2qBBJLzpKa7SPuV+RVM8imkReoGRWCvgeuJkHCuwznuBQR38RZczcO2a NuBMq8dQ==; Received: from [192.168.2.1] (port=53438 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1njKaa-000HJN-Ok; Tue, 26 Apr 2022 18:16:44 +0530 From: Arun Isaac Date: Tue, 26 Apr 2022 18:16:38 +0530 Message-Id: <20220426124639.17159-8-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220426124639.17159-1-arunisaac@systemreboot.net> References: <20220426124639.17159-1-arunisaac@systemreboot.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bioinformatics.scm (vcflib)[arguments]: In the unpack-submodule-sources phase, look for submodule sources in both inputs and native-inputs. --- gnu/packages/bioinformatics.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d74b8a0eb6..b4d809b4db 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14599,15 +14599,17 @@ (define-public vcflib (substitute* "test/Makefile" (("libvcflib.a") "libvcflib.so")))) (add-after 'unpack 'unpack-submodule-sources - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) (let ((unpack (lambda (source target) (mkdir target) (with-directory-excursion target - (if (file-is-directory? (assoc-ref inputs source)) - (copy-recursively (assoc-ref inputs source) ".") - (invoke "tar" "xvf" - (assoc-ref inputs source) - "--strip-components=1")))))) + (let ((source (or (assoc-ref inputs source) + (assoc-ref native-inputs source)))) + (if (file-is-directory? source) + (copy-recursively source ".") + (invoke "tar" "xvf" + source + "--strip-components=1"))))))) (and (unpack "filevercmp-src" "filevercmp") (unpack "fsom-src" "fsom")