GNU bug report logs - #71923
[PATCH 0/4] gnu: gvisor-tap-vsock, buildah, podman build fix.

Previous Next

Full log

View this message in rfc822 format

From: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
To: 71923 <at> debbugs.gnu.org
Cc: Jean-Pierre De Jesus DIAZ <jean <at> foundation.xyz>
Subject: [bug#71923] [PATCH 2/4] gnu: podman: Fix build.
Date: Wed,  3 Jul 2024 18:36:41 +0200

* gnu/packages/containers.scm (podman)<arguments>: Remove
'remove-go-references phase, add BUILDFLAGS=-trimpath to make-flags and
remove imported modules.

Change-Id: I6ffca5bd5be21b8b61ea9aa50273f97c5e342f9d
---
 gnu/packages/containers.scm | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index 396324284e..38af5cb3fb 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -473,12 +473,10 @@ (define-public podman
               (string-append "PREFIX=" #$output)
               (string-append "HELPER_BINARIES_DIR=" #$output "/_guix")
               (string-append "GOMD2MAN="
-                             #$go-github-com-go-md2man "/bin/go-md2man"))
+                             #$go-github-com-go-md2man "/bin/go-md2man")
+              (string-append "BUILDFLAGS=-trimpath"))
       #:tests? #f                  ; /sys/fs/cgroup not set up in guix sandbox
       #:test-target "test"
-      #:imported-modules
-      (source-module-closure `(,@%gnu-build-system-modules
-                               (guix build go-build-system)))
       #:phases
       #~(modify-phases %standard-phases
           (delete 'configure)
@@ -530,17 +528,6 @@ (define-public podman
                    ,(string-append #$passt          "/bin")
                    ,(string-append #$procps         "/bin") ; ps
                    "/run/setuid-programs")))))
-          (add-after 'install 'remove-go-references
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((go (assoc-ref inputs "go")))
-                (for-each
-                 (lambda (file)
-                   (when (executable-file? file)
-                     ((@@ (guix build go-build-system) remove-store-reference)
-                      file go)))
-                 (append (find-files (string-append #$output "/bin"))
-                         (find-files (string-append #$output "/libexec"))
-                         (find-files (string-append #$output "/lib")))))))
           (add-after 'install 'install-completions
             (lambda _
               (invoke "make" "install.completions"
-- 
2.45.2

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.