unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
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 2/4] gnu: podman: Fix build.
Date: Wed,  3 Jul 2024 18:36:41 +0200	[thread overview]
Message-ID: <a7575dd74bb5caa0a2d2c3c607d9b19e5292cb37.1720024272.git.jean@foundation.xyz> (raw)
In-Reply-To: <cover.1720024272.git.jean@foundation.xyz>

* 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





  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 ` Jean-Pierre De Jesus DIAZ [this message]
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=a7575dd74bb5caa0a2d2c3c607d9b19e5292cb37.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).