From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id kDQPLPeWQmMzQwAAbAwnHQ (envelope-from ) for ; Sun, 09 Oct 2022 11:40:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id aGhFK/eWQmNvVQAAG6o9tA (envelope-from ) for ; Sun, 09 Oct 2022 11:40:07 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 636C723005 for ; Sun, 9 Oct 2022 11:40:07 +0200 (CEST) Received: from localhost ([::1]:40916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ohSmz-0008VE-SF for larch@yhetil.org; Sun, 09 Oct 2022 05:40:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohSmw-0008Up-Vh for bug-guix@gnu.org; Sun, 09 Oct 2022 05:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43019) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ohSmw-0003Mc-Nb for bug-guix@gnu.org; Sun, 09 Oct 2022 05:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ohSmw-0004tF-Ey for bug-guix@gnu.org; Sun, 09 Oct 2022 05:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#58384: [core-updates] build-system: Fix uses of #:strip-flags and #:strip-directories. References: <93a98b47-2912-e854-dd2f-8c48f49fac92@telenet.be> In-Reply-To: <93a98b47-2912-e854-dd2f-8c48f49fac92@telenet.be> Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 09 Oct 2022 09:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58384 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 58384@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 58384-submit@debbugs.gnu.org id=B58384.166530836418750 (code B ref 58384); Sun, 09 Oct 2022 09:40:02 +0000 Received: (at 58384) by debbugs.gnu.org; 9 Oct 2022 09:39:24 +0000 Received: from localhost ([127.0.0.1]:42097 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohSmK-0004sM-4q for submit@debbugs.gnu.org; Sun, 09 Oct 2022 05:39:24 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:57678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohSmG-0004sC-Pg for 58384@debbugs.gnu.org; Sun, 09 Oct 2022 05:39:22 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by michel.telenet-ops.be with bizsmtp id VlfH2800420ykKC06lfHsd; Sun, 09 Oct 2022 11:39:17 +0200 From: Maxime Devos Date: Sun, 9 Oct 2022 11:39:16 +0200 Message-Id: <20221009093916.11252-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1665308357; bh=gCZVvXpYCWuF5O0frXSz5Kh5jGD4sk6YpC3aBhuy61o=; h=From:To:Cc:Subject:Date; b=DHjA/xK/GgSqY9180jFFvoJY++DAChXxbSXNGr2ThCA04MYpY1xp+clPjfODhGioI O2AjNH7VhHrmtG9QIUdz6losi0zU0ijXvDs2NLRvPXC2HCqgFQKtsSaMwqeQqpULyL z6ps1YrzjTp0N1c+U8I9CfB2do16/+y2FREooieV8B0BEcb1DRCGzal91jqfdliiur 97vgEXmuIx6R3EjNvQMQ56Ed1USBY98Xu48IBiF/pUc8160AmqPGBXP3xpKe3uRGeq +BGJMFaiuNMAEI6VHSyXrql6/DM19mL6iRDqoHnBE1q1rh2xA0CXJK2t3db24qbHbP BfDGOF7rKnduA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665308407; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=gCZVvXpYCWuF5O0frXSz5Kh5jGD4sk6YpC3aBhuy61o=; b=BectuPlp2N9TIaDU5QJK9y+7iT9fha+t9yukNXLcUWyd5kng+YY/rqUh/TnA09P84O7WQX xZW2ll2oSV4rifei+hfmbKKAK1oNmIQmn9j33+9sHSauV14DMbJRA1lmateVbVgVLuZxkb CNiiFVGchelIHraYq3V9Jdk+HfJJ3fY/NBWlzT35yTP0hHE4CqYKTKrd4F4aQ2AyDMuv5r az+TfXMU/W9kkL6cM3whHLLVdcf8qndV2+IOCIHpsXb01dQUiXG31xwdmQ7Gc96WtRGbgY 8wICMVJJMkoH+jgNpClzrEbFBPOzFtRC3he7vZjKbZD1ZZhPzUi5SSMepWJf0g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665308407; a=rsa-sha256; cv=none; b=Nyz0ZFyhIo9SVkWa/P0VEw1Wx08qQvsuq6w3/VON8coiUA1in4QcSR1h3kpsXZGprm9jSX op2TIYAKjtjv5HuK+4YDoanMyaAI68dNTOpQdyxD5NFguOBHfYEMhpn+/UuYL+bUacxcac soneyEl9pAgC2fWoW+DOPpb5CEK+Cw8ljhmIkJ/4OWNvSvbYAxCuH5izMBSR/0wuQhLy1+ uvdrzB/ULWVYWvYgmyRRrmyebcoW9+I3ubRL0OAoTNxR+O2Hju5YcnhXIiYfGCwLrBjgJJ dWvPlEZtQFycObfUzr2ITwmB53LpITm5tJlP91LOJmahnrRvkWE6/dT2WLVrHQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b="DHjA/xK/"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 8.32 X-Spam: Yes Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b="DHjA/xK/"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 636C723005 X-Spam-Score: 8.32 X-Migadu-Spam: Yes X-Migadu-Scanner: scn0.migadu.com X-TUID: Cg6qcjQTUJNh This fixes a bug introduced in ccc2658e2a111590ec25e308946e47a24d357785, reported at . Tested with "./pre-inst-env guix build openjpeg-data". Fixes: https://issues.guix.gnu.org/issue/58384 * guix/build-system/copy.scm (copy-build): 'strip-flags' and '#:strip-directories' are G-exps, not S-exps, so don't use sexp->gexp. * guix/build-system/cmake.scm (copy-build): Likewise. * guix/build-system/glib-or-gtk.scm (glib-or-gtk-build,glib-or-gtk-cross-build): Likewise. * guix/build-system/maven.scm (maven-build): Likewise. * guix/build-system/meson.scm (meson-build,meson-cross-build): Likewise. --- guix/build-system/cmake.scm | 4 ++-- guix/build-system/copy.scm | 4 ++-- guix/build-system/glib-or-gtk.scm | 8 ++++---- guix/build-system/maven.scm | 4 ++-- guix/build-system/meson.scm | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index ffd04867a2..effb54f044 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -149,8 +149,8 @@ (define build #:validate-runpath? #$validate-runpath? #:patch-shebangs? #$patch-shebangs? #:strip-binaries? #$strip-binaries? - #:strip-flags #$(sexp->gexp strip-flags) - #:strip-directories #$(sexp->gexp strip-directories)))))) + #:strip-flags #$strip-flags + #:strip-directories #$strip-directories))))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) system #:graft? #f))) diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index ea85719286..bf7fcaedba 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -122,8 +122,8 @@ (define builder #:validate-runpath? #$validate-runpath? #:patch-shebangs? #$patch-shebangs? #:strip-binaries? #$strip-binaries? - #:strip-flags #$(sexp->gexp strip-flags) - #:strip-directories #$(sexp->gexp strip-directories)))))) + #:strip-flags #$strip-flags + #:strip-directories #$strip-directories))))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) system #:graft? #f))) diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index a9041bb9f9..f4f431273b 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -178,9 +178,9 @@ (define build #:validate-runpath? #$validate-runpath? #:patch-shebangs? #$patch-shebangs? #:strip-binaries? #$strip-binaries? - #:strip-flags #$(sexp->gexp strip-flags) + #:strip-flags #$strip-flags #:strip-directories - #$(sexp->gexp strip-directories)))))) + #$strip-directories))))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) @@ -271,9 +271,9 @@ (define %outputs #:make-dynamic-linker-cache? #$make-dynamic-linker-cache? #:patch-shebangs? #$patch-shebangs? #:strip-binaries? #$strip-binaries? - #:strip-flags #$(sexp->gexp strip-flags) + #:strip-flags #$strip-flags #:strip-directories - #$(sexp->gexp strip-directories)))) + #$strip-directories))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) diff --git a/guix/build-system/maven.scm b/guix/build-system/maven.scm index c5a26c8754..9a17dea977 100644 --- a/guix/build-system/maven.scm +++ b/guix/build-system/maven.scm @@ -183,8 +183,8 @@ (define builder #:validate-runpath? #$validate-runpath? #:patch-shebangs? #$patch-shebangs? #:strip-binaries? #$strip-binaries? - #:strip-flags #$(sexp->gexp strip-flags) - #:strip-directories #$(sexp->gexp strip-directories))))) + #:strip-flags #$strip-flags + #:strip-directories #$strip-directories)))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) system #:graft? #f))) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index e75c1a17cb..ba3ffa6b1c 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -227,8 +227,8 @@ (define build-phases #:validate-runpath? #$validate-runpath? #:patch-shebangs? #$patch-shebangs? #:strip-binaries? #$strip-binaries? - #:strip-flags #$(sexp->gexp strip-flags) - #:strip-directories #$(sexp->gexp strip-directories) + #:strip-flags #$strip-flags + #:strip-directories #$strip-directories #:elf-directories #$(sexp->gexp elf-directories)))))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) @@ -339,8 +339,8 @@ (define build-phases #:validate-runpath? #$validate-runpath? #:patch-shebangs? #$patch-shebangs? #:strip-binaries? #$strip-binaries? - #:strip-flags #$(sexp->gexp strip-flags) - #:strip-directories #$(sexp->gexp strip-directories) + #:strip-flags #$strip-flags + #:strip-directories #$strip-directories #:elf-directories #$(sexp->gexp elf-directories))))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) base-commit: ccc2658e2a111590ec25e308946e47a24d357785 prerequisite-patch-id: 87e197146284fb770478e0c2d73027e68ee3db6d prerequisite-patch-id: 32ea6453c34258e3ac8a8766aa14ebb5fe1f5f88 -- 2.37.3