From patchwork Wed Jun 2 07:56:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 29794 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 C84C427BC78; Wed, 2 Jun 2021 08:57:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7220027BC81 for ; Wed, 2 Jun 2021 08:57:10 +0100 (BST) Received: from localhost ([::1]:53564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loLkT-0003Kg-Fb for patchwork@mira.cbaines.net; Wed, 02 Jun 2021 03:57:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loLkM-0003KV-Jn for guix-patches@gnu.org; Wed, 02 Jun 2021 03:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55384) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loLkM-0008Pw-CT for guix-patches@gnu.org; Wed, 02 Jun 2021 03:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1loLkM-00028Y-BA for guix-patches@gnu.org; Wed, 02 Jun 2021 03:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47869] [PATCH v4 core-updates] various cross-compilation fixes in guix/build/utils.scm Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Jun 2021 07:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47869 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47869@debbugs.gnu.org Received: via spool by 47869-submit@debbugs.gnu.org id=B47869.16226205998185 (code B ref 47869); Wed, 02 Jun 2021 07:57:02 +0000 Received: (at 47869) by debbugs.gnu.org; 2 Jun 2021 07:56:39 +0000 Received: from localhost ([127.0.0.1]:38697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loLjp-00027k-66 for submit@debbugs.gnu.org; Wed, 02 Jun 2021 03:56:39 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:57976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loLjl-00027X-Lb for 47869@debbugs.gnu.org; Wed, 02 Jun 2021 03:56:28 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by xavier.telenet-ops.be with bizsmtp id C7wP2500F0mfAB4017wPsa; Wed, 02 Jun 2021 09:56:23 +0200 Message-ID: From: Maxime Devos Date: Wed, 02 Jun 2021 09:56:11 +0200 In-Reply-To: <0892bdfbc097b07631190c8526a41d57b456d343.camel@telenet.be> References: <0892bdfbc097b07631190c8526a41d57b456d343.camel@telenet.be> User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1622620584; bh=vp+O/9tonAcweTV0eBUrgIAaU5SdLVR/0nayAhjPZGY=; h=Subject:From:To:Date:In-Reply-To:References; b=BCAMd7kRVQmbeGllCTrVKNlcw/jteMZhkguXZU8lZqrHCqiyiTFdWFsWdf9Ps/hZg PgHytl9G8uQoV8r3LCFdNYt8TWvz+ky70toc0yxKvI6/NjDqF+Ql7B4mIjBHipXJNX kaLTKuvQc39TdCagQUHnT+r3xvYke62036TszGgAXCkW4viMdJEoehoR8yxY7z66Ib 3x/fstDulNnkdc46fbuT3t3eHjy6Wc+6gtoTQDlzWwIblyYXgbeGuwFf1B1xnRapXn XbJhEznmfaX1QZI/J7AQJZZ/vkXRlkQ3dA0iNVBqjPVUT19RtbGG5uCTwdR/xhUJzl 66ZvOY84qz4rw== 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 Hi guix, This is version 4 of the patch series. It lets 'search-input-file' raise the new &search-error exception instead of misc-error. The documentation of 'search-input-file' has been adjusted to give an example of how it can be used. Also, there is one new test in tests/build-utils.scm ("search-input-file: can search in multiple directories"). Greetings, Maxime. From 00a73e18e1b62ec525a44cbe890843f1c93b9d16 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Mon, 31 May 2021 20:12:55 +0200 Subject: [PATCH 18/18] gnu: wireguard-tools: Set #:sh argument of 'wrap-program'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vpn.scm (wireguard-tools)[arguments]<#:phases>{wrap-wg-quick}: Set #:sh argument of ‘wrap-program’. --- gnu/packages/vpn.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 66c103e75f..34715a4cc8 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -726,6 +726,7 @@ WireGuard was added to Linux 5.6.") (coreutils (string-append (assoc-ref inputs "coreutils") "/bin"))) (wrap-program (string-append out "/bin/wg-quick") + #:sh (search-input-file inputs "bin/bash") `("PATH" ":" prefix ,(append inputs-sbin (list coreutils)))) #t)))))) -- 2.31.1