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 3/4] gnu: buildah: Fix build.
Date: Wed, 3 Jul 2024 18:36:42 +0200 [thread overview]
Message-ID: <ad36d90cc677c7e66d7426c24f6e9e4d4bc54a3d.1720024272.git.jean@foundation.xyz> (raw)
In-Reply-To: <cover.1720024272.git.jean@foundation.xyz>
* gnu/packages/containers.scm (buildah)<arguments>: Remove
'remove-go-references phase, add 'patch-buildflags phase and remove
imported modules.
Change-Id: Id89ea5c90ba8064484eec460efdfa592c974adca
---
gnu/packages/containers.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index 38af5cb3fb..1b7032ca82 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -617,9 +617,6 @@ (define-public buildah
#$go-github-com-go-md2man "/bin/go-md2man"))
#:tests? #f ; /sys/fs/cgroup not set up in guix sandbox
#:test-target "test-unit"
- #:imported-modules
- (source-module-closure `(,@%gnu-build-system-modules
- (guix build go-build-system)))
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
@@ -631,6 +628,12 @@ (define-public buildah
;; Make <4.4 causing CC not to be propagated into $(shell ...)
;; calls. Can be removed once we update to >4.3.
(setenv "CC" #$(cc-for-target))))
+ ;; Add -trimpath to build flags to avoid keeping references to go
+ ;; packages.
+ (add-after 'set-env 'patch-buildflags
+ (lambda _
+ (substitute* "Makefile"
+ (("BUILDFLAGS :=") "BUILDFLAGS := -trimpath "))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
@@ -658,8 +661,6 @@ (define-public buildah
,(string-append #$gcc "/bin") ; cpp
,(string-append #$passt "/bin")
"/run/setuid-programs")))))
- (add-after 'install 'remove-go-references
- (@@ (guix build go-build-system) remove-go-references))
(add-after 'install 'install-completions
(lambda _
(invoke "make" "install.completions"
--
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 ` [bug#71923] [PATCH 1/4] gnu: gvisor-tap-vsock: Fix build Jean-Pierre De Jesus DIAZ
2024-07-03 16:36 ` [bug#71923] [PATCH 2/4] gnu: podman: " 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 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=ad36d90cc677c7e66d7426c24f6e9e4d4bc54a3d.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).