From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 6A59GFr6ImSb9gAASxT56A (envelope-from ) for ; Tue, 28 Mar 2023 16:31:54 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id eJ9hGFr6ImTckgAA9RJhRA (envelope-from ) for ; Tue, 28 Mar 2023 16:31:54 +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 CE34B37DB for ; Tue, 28 Mar 2023 16:31:53 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phAL6-0004o5-EF; Tue, 28 Mar 2023 10:30:20 -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 1phAKy-0004iy-GK for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phAKy-0006tW-7E for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phAKy-0002cR-3Y for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates v2 18/20] gnu: guile: Switch to gexps. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Mar 2023 14:30:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62307 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62307@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 62307-submit@debbugs.gnu.org id=B62307.16800137889866 (code B ref 62307); Tue, 28 Mar 2023 14:30:12 +0000 Received: (at 62307) by debbugs.gnu.org; 28 Mar 2023 14:29:48 +0000 Received: from localhost ([127.0.0.1]:50438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phAKa-0002Yy-9Q for submit@debbugs.gnu.org; Tue, 28 Mar 2023 10:29:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phAKI-0002W1-8O for 62307@debbugs.gnu.org; Tue, 28 Mar 2023 10:29:30 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phAKD-0006TJ-1j; Tue, 28 Mar 2023 10:29:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=Hy1nHaYly2/HNYoJ+R+/A3D/oebCsC5fpZPB93ayf3A=; b=Gi508hS3vmRpWp18pj3n 4q0IdrOZRXCGD+j0yq6g0NIzZ8I8bM6ly9wUjJfdBkJXmqg8cPbYQKo6TzqEsMIBfBu+hqZKOvTri ZIootzbsjRgwLOuOZ7TzFLS64CrmzgppF3voUO4G8NT+XSQ67q3k7eWaRkZuDLpx5SQfzND3jt0R9 yQwlh/f45pSJipG6QjBjEErRjgzdB+QzKBExSog+mVim77cy0cj94bqW3goWQGI1idBCXZ2dvvNIL vO5gITbjuagJI1xhG65duZ5BTZ/amuRGp+Y9CHbVH2FjuDxKxVqWVrsG9uYcQ0mbVVEhoHPv8nNV/ MxteuG8eoNPZTw==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phAKC-00026Y-Kn; Tue, 28 Mar 2023 10:29:24 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 28 Mar 2023 16:28:50 +0200 Message-Id: <20230328142852.26635-19-ludo@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230328142852.26635-1-ludo@gnu.org> References: <87pm90bzva.fsf_-_@gnu.org> <20230328142852.26635-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680013913; a=rsa-sha256; cv=none; b=XAezbg6mHAsJ+ryhz63K8ptcwDprOKrMjVsvOXbb5Ii9kD6NVysjdK2Znoze4T7pBehxtd dZniVREE6STDcxFHwu0zEzR7FBmRvVCc9empUsydnbZ1r+Q1LFhcqM90K0jes55u/IPPZB Qy5Vh/Zx6QJFcXzknO0CmCwlb+mqRst77emYh+PCnNL4L2n4PaY5hBmDP/bkcFpO0aL1SL iDm7vK8QDEsg4aR3VL9TPb1jCVc0xVhTCdvOFxUNICb5gogcrOrvWj8Nfv4na7RN2SxbTw tPY3xWXknegDySQWooOpueCrKuqGadJJjlh+LFP5gXZwcJZ/qvb86kk8XBDf8A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Gi508hS3; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680013913; 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=Hy1nHaYly2/HNYoJ+R+/A3D/oebCsC5fpZPB93ayf3A=; b=MuFxfzvU7TfTMIKlxT2toPyrDg7IsDi4i2TaPKJAeKTkPz53hGcdOWsl+dOaEIJlgX9Yk5 F4pDSHQl585jVWZ62AXUAd+OBsDjXYaaSZ6SU+SfaYsQe9fxxV78gGtF5WfYUlSAZ6UcNo cS70ij5vSQIlbmuds0aehJ1xHp4V/nlnEH1jnABkU9/OBcZhpvbM9QMWtb68gQFKdQXJUA yx6uT6VKCflorX2tQW09fjZ6K0gbGOdOwvdvIP1zpifJ67PnRYBXn5L8ZGy7+jK7YKUoi6 wg5kl9WDxI7oolZib81ATwneBGLw7QVgNGt8xYvWrMa7nbpERaS95RSKd/rOAA== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Gi508hS3; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -1.13 X-Spam-Score: -1.13 X-Migadu-Queue-Id: CE34B37DB X-TUID: jqCDfHVe0Y06 * gnu/packages/guile.scm (guile-3.0)[arguments]: Switch to gexps. (guile-next)[arguments]: Likewise. --- gnu/packages/guile.scm | 113 +++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 56 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 2adf271d07..d18c155ab3 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -58,6 +58,7 @@ (define-module (gnu packages guile) #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages version-control) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -344,51 +345,51 @@ (define-public guile-3.0 ;; cross-compiling. ((#:parallel-build? _ #f) (not (%current-target-system))) - ((#:configure-flags flags ''()) + ((#:configure-flags flags #~'()) ;; XXX: JIT-enabled Guile crashes in obscure ways on GNU/Hurd. - `(cons* ,@(if (hurd-target?) - '("--disable-jit") - '()) - ;; -fexcess-precision=standard is required when compiling for - ;; i686-linux, otherwise "numbers.test" will fail - ;; (see and - ;; ). - ;; TODO: Keep this in GUILE-2.2 and remove from here on next - ;; rebuild cycle. - ,@(if (target-x86-32?) - '("CFLAGS=-g -O2 -fexcess-precision=standard") - '()) - "--enable-mini-gmp" - '("--disable-static"))) + #~(cons* #$@(if (hurd-target?) + #~("--disable-jit") + #~()) + ;; -fexcess-precision=standard is required when compiling for + ;; i686-linux, otherwise "numbers.test" will fail + ;; (see and + ;; ). + ;; TODO: Keep this in GUILE-2.2 and remove from here on next + ;; rebuild cycle. + #$@(if (target-x86-32?) + #~("CFLAGS=-g -O2 -fexcess-precision=standard") + #~()) + "--enable-mini-gmp" + '("--disable-static"))) ((#:phases phases) - `(modify-phases ,phases - (add-before 'check 'disable-stack-overflow-test - (lambda _ - ;; This test can invoke the "OOM killer", especially when - ;; running on emulated hardware (QEMU). Skip it. - (substitute* "test-suite/standalone/test-stack-overflow" - (("!#") - "!#\n(exit 77)\n")))) + #~(modify-phases #$phases + (add-before 'check 'disable-stack-overflow-test + (lambda _ + ;; This test can invoke the "OOM killer", especially when + ;; running on emulated hardware (QEMU). Skip it. + (substitute* "test-suite/standalone/test-stack-overflow" + (("!#") + "!#\n(exit 77)\n")))) - ,@(if (target-ppc32?) - `((add-after 'unpack 'adjust-bootstrap-flags - (lambda _ - ;; Upstream knows about suggested solution. - ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45214 - ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=977223#46 - (substitute* "stage0/Makefile.in" - (("^GUILE_OPTIMIZATIONS.*") - "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps\n"))))) - '()) - ,@(if (or (target-ppc32?) - (target-riscv64?)) - `((add-after 'unpack 'skip-failing-fdes-test - (lambda _ - ;; ERROR: ((system-error "seek" "~A" ("Bad file descriptor") (9))) - (substitute* "test-suite/tests/ports.test" - (("fdes not closed\"" all) (string-append all "(exit 77)"))) - #t))) - '()))))) + #$@(if (target-ppc32?) + #~((add-after 'unpack 'adjust-bootstrap-flags + (lambda _ + ;; Upstream knows about suggested solution. + ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45214 + ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=977223#46 + (substitute* "stage0/Makefile.in" + (("^GUILE_OPTIMIZATIONS.*") + "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps\n"))))) + #~()) + #$@(if (or (target-ppc32?) + (target-riscv64?)) + #~((add-after 'unpack 'skip-failing-fdes-test + (lambda _ + ;; ERROR: ((system-error "seek" "~A" ("Bad file descriptor") (9))) + (substitute* "test-suite/tests/ports.test" + (("fdes not closed\"" all) (string-append all "(exit 77)"))) + #t))) + #~()))))) (native-search-paths (list (search-path-specification @@ -436,20 +437,20 @@ (define-public guile-next (arguments (substitute-keyword-arguments (package-arguments guile-3.0) ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-before 'bootstrap 'set-version - (lambda _ - ;; Tell 'git-version-gen' what version this is, or it will - ;; just pick "UNKNOWN", making it unusable as a replacement - ;; for 'guile-3.0'. XXX: This is inaccurate when using - ;; '--with-branch' but using (package-version this-package) - ;; wouldn't give us a valid version string. - (call-with-output-file ".tarball-version" - (lambda (port) - (display ,version port))))) - (add-before 'check 'skip-failing-tests - (lambda _ - (delete-file "test-suite/tests/version.test"))))))) + #~(modify-phases ,phases + (add-before 'bootstrap 'set-version + (lambda _ + ;; Tell 'git-version-gen' what version this is, or it will + ;; just pick "UNKNOWN", making it unusable as a replacement + ;; for 'guile-3.0'. XXX: This is inaccurate when using + ;; '--with-branch' but using (package-version this-package) + ;; wouldn't give us a valid version string. + (call-with-output-file ".tarball-version" + (lambda (port) + (display #$version port))))) + (add-before 'check 'skip-failing-tests + (lambda _ + (delete-file "test-suite/tests/version.test"))))))) (native-inputs (modify-inputs (package-native-inputs guile-3.0) (prepend autoconf -- 2.39.2