From: Jean-Pierre De Jesus DIAZ <jean@foundation.xyz>
To: 71923@debbugs.gnu.org
Cc: Jean-Pierre De Jesus DIAZ <jean@foundation.xyz>
Subject: [bug#71923] [PATCH 1/4] gnu: gvisor-tap-vsock: Fix build.
Date: Wed, 3 Jul 2024 18:36:40 +0200 [thread overview]
Message-ID: <49da27736e5834aa9444c8bf7b9fa727f938b521.1720024272.git.jean@foundation.xyz> (raw)
In-Reply-To: <cover.1720024272.git.jean@foundation.xyz>
* gnu/packages/containers.scm (gvisor-tap-vsock)<arguments>: 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
next prev parent reply other threads:[~2024-07-03 16:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-03 16:34 [bug#71923] [PATCH 0/4] gnu: gvisor-tap-vsock, buildah, podman build fix Jean-Pierre De Jesus DIAZ
2024-07-03 16:36 ` Jean-Pierre De Jesus DIAZ [this message]
2024-07-03 16:36 ` [bug#71923] [PATCH 2/4] gnu: podman: Fix build Jean-Pierre De Jesus DIAZ
2024-07-03 16:36 ` [bug#71923] [PATCH 3/4] gnu: buildah: " Jean-Pierre De Jesus DIAZ
2024-07-03 16:36 ` [bug#71923] [PATCH 4/4] gnu: podman: Update to 5.1.1 Jean-Pierre De Jesus DIAZ
2024-07-03 21:36 ` [bug#71923] [PATCH 0/4] gnu: gvisor-tap-vsock, buildah, podman build fix Sharlatan Hellseher
2024-07-03 21:58 ` Sharlatan Hellseher
2024-07-03 22:00 ` bug#71923: " Sharlatan Hellseher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49da27736e5834aa9444c8bf7b9fa727f938b521.1720024272.git.jean@foundation.xyz \
--to=jean@foundation.xyz \
--cc=71923@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).