From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id CGO3I/wLFWfDyAAAqHPOHw:P1 (envelope-from ) for ; Sun, 20 Oct 2024 13:56:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id CGO3I/wLFWfDyAAAqHPOHw (envelope-from ) for ; Sun, 20 Oct 2024 15:56:12 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=GPQsSgEC; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=rukJZ6Px; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1729432572; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=G3A423lbQ+ZpywqV8KjqHsaCj7E8FvufsRSr/zKYIkY=; b=Cg3p8F5p8ddraKRSaj2s0nunQ5cvsmsqEMtjqDA1PEI7A0y1iqmjcrJOgvdQBzH6IUIews eyHgQKiD+qt1dFFdVYnYakhs44i1e1g2L5qO8fE7VGj8567X+EIDcSK0ADD3C2GzXxIeRH ZdZYm/5nUsPgFJ9er/wZ2AZE8tWV8/FHEmld38V94VPWxy1xr1AY2GYekRyp1r8Qop0HC0 Mzlb9O+l/sMfcRqGsNzfOxMF8fsSK44L1jcMP72xiwowiu30rT9W9E8d0UfpmDQkj2GotP kmoS5JL21ykDIk2oxIrtsqbc0Ye42lAs5Xj1PWWwsKhDRA58EGPTGZvJMHsP9g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=GPQsSgEC; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=rukJZ6Px; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1729432572; a=rsa-sha256; cv=none; b=KEmt/HWDvV1y88hEHGqps5SdvEEvKekQ9uL5cMrHuSnBbBuPqCnhtvH+PkupVJN9xBhIJ1 ID8cszVTnyF7h1grW7WhPLaOTb21kktIC3LzU+HhNEjNyTB22qT1Xo3D4Xd1zLlS9m7z1D 6oMrRWbdneQy0SGm0aqqWEJfY2ZyvupAHLVfiXlAsPOAI+gYxAbMXJ2/VitKL5x7M6ln9V GiPM76Y9RfLt8qxsmpU1MJzfSvqqjNKHuT6pwYn87uYXHAetlK0CVKPuJLU8pZpRodJXfB 4M5LxjxrgosbW9rq1liR+7QH2dUd+XHJsO+6cBW1bcmD4MSN3iOd1pa+FcXkRQ== 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 245257D0F4 for ; Sun, 20 Oct 2024 15:56:12 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2WPF-0004df-D7; Sun, 20 Oct 2024 09:55:41 -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 1t2WPC-0004cs-1K for guix-patches@gnu.org; Sun, 20 Oct 2024 09:55:38 -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 1t2WPB-0003bh-Of for guix-patches@gnu.org; Sun, 20 Oct 2024 09:55:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=G3A423lbQ+ZpywqV8KjqHsaCj7E8FvufsRSr/zKYIkY=; b=GPQsSgECoWxkopw+yCd4Ze0sd+XzjgVfFVpDyCPqUwV1UyQZCXgJXP6Qoiml0OZtR5WWcoe/0/TnrFNVZbhfS3Xt3sFVo4szXTbDRgT0jtCygyVyyGEplKZMyz/f8L7JPVVuhhYSzWNYIcQCfmCNVipdIy9KHthf9eDAzir3OTuL4ygGoNUMmuOuEKDFYTZ5gO0Ie3HG1gvLiA6cBw5x4xTU1yF5la+gCDN8cadpQ94Hqbuw2+CcPCp/A5xdmNSJOuiJKlGRPekr4Lnno8NK9xF2+zl02CZEbANZukVax3i9zShBY+mmjJPP/9gkqBLykRslZxxE4OkoR8YrXYFqRw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t2WPa-0001FY-Rc for guix-patches@gnu.org; Sun, 20 Oct 2024 09:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73894] [PATCH v2 2/2] guix: chicken-build-system: Fix the build-system. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Oct 2024 13:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73894 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73894@debbugs.gnu.org Cc: Nicolas Graves , zhengjunjie@iscas.ac.cn Received: via spool by 73894-submit@debbugs.gnu.org id=B73894.17294325283327 (code B ref 73894); Sun, 20 Oct 2024 13:56:02 +0000 Received: (at 73894) by debbugs.gnu.org; 20 Oct 2024 13:55:28 +0000 Received: from localhost ([127.0.0.1]:46744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t2WP1-0000qy-Lm for submit@debbugs.gnu.org; Sun, 20 Oct 2024 09:55:28 -0400 Received: from 1.mo581.mail-out.ovh.net ([178.33.45.51]:32939) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t2WOx-0000nV-0D for 73894@debbugs.gnu.org; Sun, 20 Oct 2024 09:55:24 -0400 Received: from director5.ghost.mail-out.ovh.net (unknown [10.109.140.28]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 4XWg1D1hPtz1BP3 for <73894@debbugs.gnu.org>; Sun, 20 Oct 2024 13:54:55 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-wjxxw (unknown [10.110.118.160]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 86F511FDF0; Sun, 20 Oct 2024 13:54:53 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-5b5ff79f4f-wjxxw with ESMTPSA id Vu0bC60LFWfM8AkAfmDdGw (envelope-from ); Sun, 20 Oct 2024 13:54:53 +0000 X-OVh-ClientIp: 86.246.19.221 Date: Sun, 20 Oct 2024 15:54:31 +0200 Message-ID: <20241020135439.16283-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241020135439.16283-1-ngraves@ngraves.fr> References: <20241020135439.16283-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 841891655403954914 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehjedgjedtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeefkeelgeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=G3A423lbQ+ZpywqV8KjqHsaCj7E8FvufsRSr/zKYIkY=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729432496; v=1; b=rukJZ6PxwfbYqu4Z/J/5BNeSwCmVsMLJ+U8gInKDei4viTcifHpCW3O55SrZL6Vcuntdt8XO sySJKhfO2amN6m/UQCtl3UszaOhGcydprxQ//VP2RlUiTY131Pb3LcJwZG6gGXVTkcsXx8ide7e Wa8XbjCQQk8Kj56ch/OO+cFS1v6H1yAALO6hb2vBX5ivgx/pb14eyVCl2eSrcWRPx6WhPa1A/Z8 ekU4eXn+LI9p0aZ4Zjs/G4s0PJtMyFIaBukbPDCL9IMZO5MCDBDjDeZ0VbSIL2F5dooPS0a53qG kTOtx8VSrF53FH26CGxzrH52sQgSDsLBoQ6lItwL0rHzg== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via 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 X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -0.00 X-Spam-Score: -0.00 X-Migadu-Queue-Id: 245257D0F4 X-TUID: uZWIR7CDbOCw * guix/build/chicken-build-system.scm (stamp-egg-version): Modify phase to create the new mandatory $CHICKEN_EGG_CACHE/.cache-metadata/STATUS and $CHICKEN_EGG_CACHE/.cache-metadata/VERSION. --- guix/build/chicken-build-system.scm | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/guix/build/chicken-build-system.scm b/guix/build/chicken-build-system.scm index 8f9f59cc25..92bccae619 100644 --- a/guix/build/chicken-build-system.scm +++ b/guix/build/chicken-build-system.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 raingloom +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,8 +89,7 @@ (define (unpack-maybe-strip source dest) (mkdir-p dest) (if (file-is-directory? source) (copy-recursively source dest #:keep-mtime? #t) - (unpack-maybe-strip source dest))) - #t) + (unpack-maybe-strip source dest)))) (define* (build #:key egg-name #:allow-other-keys) "Build the Chicken egg named by EGG-NAME" @@ -111,15 +111,25 @@ (define* (check #:key egg-name tests? #:allow-other-keys) (when tests? (invoke "chicken-install" "-cached" "-test" "-no-install" egg-name))) -(define* (stamp-egg-version #:key egg-name name #:allow-other-keys) - "Check if EGG-NAME.egg contains version information and add some if not." - (let* ((filename (string-append egg-name "/" egg-name ".egg")) - (egg-info (call-with-input-file filename read)) +(define* (stamp-egg-version #:key egg-name name inputs #:allow-other-keys) + "Check if EGG-NAME.egg contains version information and add some if not. +Since chicken@5.4.0, also create the STATUS and VERSION files in +$CHICKEN_EGG_CACHE/.cache-metadata." + (let* ((egg (string-append egg-name "/" egg-name ".egg")) + (metadatadir (string-append (getenv "CHICKEN_EGG_CACHE") + "/.cache-metadata/" egg-name)) + (egg-info (call-with-input-file egg read)) (ver? (find (lambda (i) (eqv? (car i) 'version)) egg-info)) (ver (substring name (1+ (string-rindex name #\-))))) - (when (not ver?) - (make-file-writable filename) - (call-with-output-file filename + (mkdir-p metadatadir) + (install-file (search-input-file inputs "/share/chicken/STATUS") + metadatadir) + (call-with-output-file + (string-append metadatadir "/VERSION") + (lambda (p) (format p "~a" ver))) + (unless ver? + (make-file-writable egg) + (call-with-output-file egg (lambda (f) (write (cons `(version ,ver) egg-info) f)))))) ;; It doesn't look like Chicken generates any unnecessary references. -- 2.46.0