From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id GI5WOpl+hWazFQAAe85BDQ:P1 (envelope-from ) for ; Wed, 03 Jul 2024 16:38:50 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id GI5WOpl+hWazFQAAe85BDQ (envelope-from ) for ; Wed, 03 Jul 2024 18:38:50 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=foundation.xyz header.s=google header.b=EHMT93WD; dmarc=fail reason="SPF not aligned (relaxed)" header.from=foundation.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720024729; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=V47GnwLNN7skzZt7h9k9wMvT0ZY6EEjGwQN3y7TR2bQ=; b=NuZ1sQfNIL3eqsvb6UewrkexGczh63BzrJ16s1MLWmJ6T2GThKppT1uNCbodSJPiEu+Ota exJ2Cc/0aL0GSavzrD3iq3xWLiP6csZPvmnc/SIeiwbMY+BsU6BtwyI6g197vMX9OzOf/e tXHMvKz0kmdCsk3qx4Rd8U5KX/bUdIP+sjqeHLe5lZyAVP5HOFwcWXxnF/YyiOp8Muln1w svy3UgAba2Xr2j6Rj7n2mptSGU7MDzOci7fzuUH+ojU97mWue5uK2jztJoDlaVX/jIakc+ aUex354b+5yoDKCyzpJDRH+TvQq7KwuKBHhk3Yc506A/EKko2S6cwMKaQ5QE9A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720024729; a=rsa-sha256; cv=none; b=TlKwd4zSTEHLCFuG7rS4fGORS5EhfyX5wnbwKAyF57mMgk83vjlnZgMfmaZGVFhSHQAH9a Tpmzk7Zqw0ncd4A03DAQ0azR38WYvpMVIKxjh2YpCxWWIWmKn5aSwp/l4sVpGXSuewL/+A rWpzfuWUCP+dm7lwcvZl/Ld504nU1unjmaRKSWzS7I5CHNQyQdvkY6/krriEV5dGDryWgY Z9++wtxtYgWavdECa1Q7vA/LU1lWU85SFbGN4nbf0w/3cD7ioKUPVOkdZmxX1L1QR0/VuI HzQYaHGNBnEZyGGmsgRHM/GCRKNagkdL61BU7bwODkqaUL7bxKYPAcjHWyPQ7A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=foundation.xyz header.s=google header.b=EHMT93WD; dmarc=fail reason="SPF not aligned (relaxed)" header.from=foundation.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C842138437 for ; Wed, 03 Jul 2024 18:38:49 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP2zZ-0004op-IM; Wed, 03 Jul 2024 12:38:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sP2zY-0004oQ-Kb for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sP2zY-0005KZ-C1 for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sP2za-0006YI-5G for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71923] [PATCH 1/4] gnu: gvisor-tap-vsock: Fix build. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Jul 2024 16:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71923 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71923@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 71923-submit@debbugs.gnu.org id=B71923.172002467125129 (code B ref 71923); Wed, 03 Jul 2024 16:38:02 +0000 Received: (at 71923) by debbugs.gnu.org; 3 Jul 2024 16:37:51 +0000 Received: from localhost ([127.0.0.1]:40264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP2zO-0006XD-Vb for submit@debbugs.gnu.org; Wed, 03 Jul 2024 12:37:51 -0400 Received: from mail-wr1-f44.google.com ([209.85.221.44]:61764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP2zN-0006X1-4i for 71923@debbugs.gnu.org; Wed, 03 Jul 2024 12:37:49 -0400 Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-367339bd00aso4387763f8f.3 for <71923@debbugs.gnu.org>; Wed, 03 Jul 2024 09:37:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1720024606; x=1720629406; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V47GnwLNN7skzZt7h9k9wMvT0ZY6EEjGwQN3y7TR2bQ=; b=EHMT93WDzJyfv2MNuCqFXekRu6zNhpuOPjh/3Okxf2V8ipQ9oSJp3PbWGynxXV1O4b eooWbyQ9v8oTivQFPgy+31PLPET/4tg7jG3diVcESXProDj4PjULesrSlLwMcAYwtLsv ZmHnkq+53Bq6ame881gzLDDiJ6KzpFPUgAZ1Vd3SQxLCHO2Ub0PstFIDvvumxd/W+9Rd BRNOwP/hQYDHNYHSlOgPPk1P9m3zIxnNx6KjYjjFVGrqyMwsPQ4GPbPjYgI1tCpCYlJr huBWb5IchP4JXBQx/P3sLXM+ETe4n/EOzO+1eO4MndsA9EVEkhRFfmr75tvnhF4L/rMR kZNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720024606; x=1720629406; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V47GnwLNN7skzZt7h9k9wMvT0ZY6EEjGwQN3y7TR2bQ=; b=hlSFOKjoHwmDnvvYpEp/P/hsix5Ix2j4qOmGEQnin9Q3GiSjawcnLGnmnsmJzKtvuh Z8GV562OYhh+CMOiB+jsPFo6+chTcFv77O0KlnyGreJmLl6yTAMcfbM37XHzAksbZZMd GSW/Kn+0bL+cxRbYEvXePj4X9dToPMx3Dbi0E+GArhXUR/3VQtJMqvmPhS0bvJR37GeA pKhDZVz305X6tHSAnQOy2h8cKFYpiM59E5fOVPTa54VoctDG6zClIe5pz6dCRo0fUDD6 RSNx+QzsWtYs5HXgXEubgVCmgc0XwAoAZAtWEQe+9ZehTvcVDsJ8ptecsWr6rQC/RilA dbXQ== X-Gm-Message-State: AOJu0Yw2XSyqSqRNkdtZYsN7FudIuldml6jqniCUSlBN5CfzFD6yw3QP eGCOFhid86YPSozHOorcXCGJLu4ESHA9t5P7FMah+39LP+fvpjj3FVU8/k5SOpWfMbgh8bYdpuC q X-Google-Smtp-Source: AGHT+IEOmT1QZqErMPuEvTCMYX9gI8idZxTiuc1ooD/Pf17yxRaGfLWc/SV6RziHvE3OW5ic0QdMTA== X-Received: by 2002:a5d:5301:0:b0:367:40e6:46bd with SMTP id ffacd0b85a97d-3677572985bmr7068372f8f.61.1720024605963; Wed, 03 Jul 2024 09:36:45 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-367956ca37asm1760356f8f.75.2024.07.03.09.36.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 09:36:45 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Wed, 3 Jul 2024 18:36:40 +0200 Message-ID: <49da27736e5834aa9444c8bf7b9fa727f938b521.1720024272.git.jean@foundation.xyz> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.79 X-Spam-Score: -0.79 X-Migadu-Queue-Id: C842138437 X-Migadu-Scanner: mx11.migadu.com X-TUID: 1na+4hAQaBvw * gnu/packages/containers.scm (gvisor-tap-vsock): Remove 'remove-go-references phase, add 'patch-go-reference phase and remove imported modules. Change-Id: I202292e303268b3ec0f13f19d4ceba517cd73aaa --- gnu/packages/containers.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index c57f249ebd..396324284e 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -392,12 +392,15 @@ (define-public gvisor-tap-vsock (list #:make-flags `(list ,(string-append "GIT_VERSION=v" version)) #:test-target "test" - #:imported-modules - (source-module-closure `(,@%gnu-build-system-modules - (guix build go-build-system))) #:phases #~(modify-phases %standard-phases (delete 'configure) + ;; Add -trimpath flag to avoid keeping references to go package + ;; in the store. + (add-after 'unpack 'patch-go-reference + (lambda _ + (substitute* "Makefile" + (("go build") "go build -trimpath")))) (add-before 'build 'setenv (lambda _ ;; For golang toolchain. @@ -408,9 +411,7 @@ (define-public gvisor-tap-vsock (invoke "rm" "-r" "test"))) (replace 'install (lambda _ - (install-file "bin/gvproxy" (string-append #$output "/bin")))) - (add-after 'install 'remove-go-references - (@@ (guix build go-build-system) remove-go-references))))) + (install-file "bin/gvproxy" (string-append #$output "/bin"))))))) (native-inputs (list go-1.20)) (home-page "https://github.com/containers/gvisor-tap-vsock") (synopsis "Network stack for virtualization based on gVisor") -- 2.45.2