From patchwork Wed Jul 3 16:36:42 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: 65886 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 6F3D027BBE9; Wed, 3 Jul 2024 17:38:36 +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 B8D8027BBE2 for ; Wed, 3 Jul 2024 17:38:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP2zb-0004pw-To; Wed, 03 Jul 2024 12:38:03 -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-0004oq-K6 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 1sP2zZ-0005Kp-Al for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sP2zb-0006YY-33 for guix-patches@gnu.org; Wed, 03 Jul 2024 12:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71923] [PATCH 3/4] gnu: buildah: 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:03 +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.172002467925170 (code B ref 71923); Wed, 03 Jul 2024 16:38:03 +0000 Received: (at 71923) by debbugs.gnu.org; 3 Jul 2024 16:37:59 +0000 Received: from localhost ([127.0.0.1]:40271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP2zW-0006Xs-RL for submit@debbugs.gnu.org; Wed, 03 Jul 2024 12:37:59 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:48130) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP2zT-0006XB-Ul for 71923@debbugs.gnu.org; Wed, 03 Jul 2024 12:37:56 -0400 Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-367601ca463so3175422f8f.0 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=1720024608; x=1720629408; 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=Ym5k5K/rSjvaEsGdSOC6J5L9do04yhB//geYWjvuvzI=; b=gG5NU8azX97aw0+xLiPaL5jsUbx2v+RBMt557XZ31xz6i27PJ6zPHvLtid1vB7PaKD MwJ2B4uIT7W6SkcqWWPhtvxISzxEziRArxVoBTUSDsV3a24JzmBfbusxVw2Q7LGu0PvI VRHNjDwpTu/ooge2f9MP7nKq12xO3KKD6NnEUdP7BwKwAHBzuPs+50eDF+QCua4W9uQP 6hmFJg8w/uTggCyA0sxSc/LgGspw2sCDXPyOz6gLKbZ0w2tJPYm64k1UbHY4tJ6GOhSu K78BgXkhGqfFMa31zjWkae8xtzXuFL9kbKy6a+YsQNHqGaHcV5F8I7qERJmD4iVn2cKN qfNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720024608; x=1720629408; 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=Ym5k5K/rSjvaEsGdSOC6J5L9do04yhB//geYWjvuvzI=; b=mZqppv7eab2ER5baO0Gqhs5UcSqW7jRdVn2dd/bdXYrpPT1MK3nY4PG3o3PyYfxKuN KpLdR5nwJprT5LFMON9PEzuDaaRZLFRIEKZOYc8k1wGpKeizcd6PAzlyzBkgwrO5L8oN UYh+dBxaKHKjhDOdsKoXeIcMMKv814uUb+XiLu9IZ6SAwDle9Vwc5RQdo2ulFRpleG7H /h6CLY3QveGKhxKcPigoAj4l1AkBZjXQsHV65KXGyKZSq7nQO/T2e5XyRgQBOfOFrW9+ 24cyKfXOp/8vYgENSDdf+iVO37Koa1R5wmuRGaqjcwJy8Br8J5i51F5xeSX7Mnhjz0iX iJEQ== X-Gm-Message-State: AOJu0YzOJR46AlkQhNsr7NLOvmpHb0VwWRU29CoSISal+IbdLyjr8g0M /m2s3JA2kYVfAFeFkj/qGfM7L3Aai8LedOLJ5ZAC3QDcOCzmOV806DQybF4lW/qEOHY+PBIx0wN w X-Google-Smtp-Source: AGHT+IHrjp3WI9yOM1qwmXefx47UjORhCXMtkmPDtJoZJJoEyBNDYEqn96g7tj1wtmoeMF55IpmcSw== X-Received: by 2002:a05:6000:154f:b0:366:ec2f:dbd3 with SMTP id ffacd0b85a97d-3677571b658mr11392277f8f.47.1720024608301; Wed, 03 Jul 2024 09:36:48 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 09:36:48 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Wed, 3 Jul 2024 18:36:42 +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 (buildah): 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"