From patchwork Wed Jul 3 16:36:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 28932 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8F8AC27BBE9; Wed, 3 Jul 2024 17:38:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 15F3E27BBE2 for ; Wed, 3 Jul 2024 17:38:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP2za-0004pG-JU; Wed, 03 Jul 2024 12:38:02 -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 1sP2zZ-0004od-37 for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:01 -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-0005Kh-Qr 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-0006YR-KQ for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71923] [PATCH 2/4] gnu: podman: 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.172002467625153 (code B ref 71923); Wed, 03 Jul 2024 16:38:02 +0000 Received: (at 71923) by debbugs.gnu.org; 3 Jul 2024 16:37:56 +0000 Received: from localhost ([127.0.0.1]:40268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP2zU-0006XY-CP for submit@debbugs.gnu.org; Wed, 03 Jul 2024 12:37:56 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:46424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP2zS-0006X2-W3 for 71923@debbugs.gnu.org; Wed, 03 Jul 2024 12:37:55 -0400 Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-36789d19ffbso891404f8f.1 for <71923@debbugs.gnu.org>; Wed, 03 Jul 2024 09:37:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1720024607; x=1720629407; 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=EnykTgSuz/BLYADj7iY4JEcaTQfRC2HaPZ8PpBPkKwk=; b=NGHc7UPLofGlSc52n082kL5D5dtagRGoau9yUgPRiaIZ0+vvWWfqI+oF7eRkUgM8Vq Ick8Zuffg7USw4FuBx+3DsUwVuZQ1qmrOiLA/YnWX4TbZgfiipGETLlJOT5ffJpqltn8 m0MgOFmwJIoDzC8q+VvhcB/2hrMpAu6h24upX7TEm9HkIKzHZTBXAEZtKxXGNyvEP5Dy 6BgKD1g/BoZ4OeK+sHYCfw3pihgZlzuAOoEss8YN+Os9PuSvxRehczpyoQEN/Ojj/raz 8kAaNLR8WBXXuTemBR3fNKOnLwHpssHg++QIuaIdDhtRqAdQZ7or0IsZjgNDYgLkyFtL htxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720024607; x=1720629407; 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=EnykTgSuz/BLYADj7iY4JEcaTQfRC2HaPZ8PpBPkKwk=; b=Q1lA0fW/2BJh3l1nz+G+FkXoiY+z/D6jGq7NFyTrp1V3pFYJEv5Q7WzcSbYhJYjeLJ OB7N+4YyTK6Y6Y5hH1JRMp5mFRgC/IgR4FzmJbI4vG3+d8T4b8YyaI6cWA1yFprwwfon lCojwmNq9qjEVgfpT+RoDYjkZMAlIUvtecFxkV7ch5q9NNDW99KYYBIH2A9jDORBMg6Q TanYT7Zv4/tbrRlAe1pYXdd5skrrVTSpBUeEMAAP6XRQW0IOVjUK75STuwHbHTiKpBdX 6ehTRtuW3vCW59IO03SoLuo9aeojdjTZA+Qc8LTOIFwrW42xEWF755UN5CrVdK6j6Gws ZZaw== X-Gm-Message-State: AOJu0YyD7eXZlPgXWc7yVmQRdSZoSdQ1jWHYgLv0/5mudHe8ba3ahRwA 0IDkRYOrwEkfuutC8c8DyKpXobrgyJ46YT8CMb6g1iQ6ggtF+mZuapndcxhhPuE2vS0Iz8pbmhc Y X-Google-Smtp-Source: AGHT+IGoa29ReLGU7uxTsMUQJ0ky2didxzk20cCDDQqhGS/Ywgl1ClSePV3WYgMEjv63FEvPDYqUEw== X-Received: by 2002:a5d:6b11:0:b0:35f:1835:3a76 with SMTP id ffacd0b85a97d-3677572968amr8499074f8f.70.1720024607207; Wed, 03 Jul 2024 09:36:47 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 09:36:46 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Wed, 3 Jul 2024 18:36:41 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/containers.scm (podman): 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"