From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 4NnIDouuUl9YTwAA0tVLHw (envelope-from ) for ; Fri, 04 Sep 2020 21:15:55 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id qE/BCouuUl9fLQAAbx9fmQ (envelope-from ) for ; Fri, 04 Sep 2020 21:15:55 +0000 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 79C2F9404E1 for ; Fri, 4 Sep 2020 21:15:54 +0000 (UTC) Received: from localhost ([::1]:60664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kEIHf-0000Rj-QU for larch@yhetil.org; Fri, 04 Sep 2020 16:26:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kEIHb-0000R7-MP for guix-patches@gnu.org; Fri, 04 Sep 2020 16:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57414) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kEIHb-0001lF-DM for guix-patches@gnu.org; Fri, 04 Sep 2020 16:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kEIHb-0006IR-AA for guix-patches@gnu.org; Fri, 04 Sep 2020 16:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43183] [PATCH v2 2/5] gnu: guile-pfds: When using Guile 3, compile as a r6rs library. Resent-From: Martin Becze Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Sep 2020 20:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43183 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43183@debbugs.gnu.org Cc: Martin Becze Received: via spool by 43183-submit@debbugs.gnu.org id=B43183.159925115124151 (code B ref 43183); Fri, 04 Sep 2020 20:26:03 +0000 Received: (at 43183) by debbugs.gnu.org; 4 Sep 2020 20:25:51 +0000 Received: from localhost ([127.0.0.1]:40719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEIHP-0006HN-A1 for submit@debbugs.gnu.org; Fri, 04 Sep 2020 16:25:51 -0400 Received: from mx1.riseup.net ([198.252.153.129]:50894) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kEIHF-0006GU-Sz for 43183@debbugs.gnu.org; Fri, 04 Sep 2020 16:25:43 -0400 Received: from bell.riseup.net (bell-pn.riseup.net [10.0.1.178]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4Bjq1d3X3HzFmNs for <43183@debbugs.gnu.org>; Fri, 4 Sep 2020 13:25:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1599251141; bh=z7261htkwWHBcO6v85eGkiE6121TWM6ywkZZc09yiLg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vq8gi2BC+BEID8/qks/A1QVjiXYcLbvftj3eRt4Es5kVEoOGxgJw2d10O1lX5sFu7 lLV3xagHnEHesoX4cYSTpKzUg5EO7+/FrqTIlV4oyUdWWAUI3OuaG47diOOe0/oz12 v1y1ZuYpYjbK0TA+p7MEu+jLhiYmjR1g5qYuYAz8= X-Riseup-User-ID: D1094585AC45F6739A1F6960B629409555C96B7DEE0F1104CFF413EEF5436E0C Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 4Bjq1c4VMtzJn6Z; Fri, 4 Sep 2020 13:25:40 -0700 (PDT) From: Martin Becze Date: Fri, 4 Sep 2020 15:25:14 -0500 Message-Id: <20200904202517.6131-3-mjbecze@riseup.net> In-Reply-To: <20200904202517.6131-1-mjbecze@riseup.net> References: <20200903150243.27796-1-mjbecze@riseup.net> <20200904202517.6131-1-mjbecze@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) 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" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=riseup.net header.s=squak header.b=Vq8gi2BC; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 5.09 X-TUID: o2rn2d30f4vW This allow the package to be resused by r6rs compliant scheme implementations that expect *.sls files. * gnu/packages/guile-xyz.scm (guile2.2-pfds): Rename *.sls files to *.scm since Guile 2 does not support the sls extension. (guile-pfds): Removed the renaming of files to *.sls to *.scm. --- gnu/packages/guile-xyz.scm | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index fa6855f43d..308ce0ad59 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -798,6 +798,7 @@ using Guile's foreign function interface.") (build-system guile-build-system) (arguments '(#:source-directory "src" + #:compile-flags '("--r6rs" "-Wunbound-variable" "-Warity-mismatch") #:phases (modify-phases %standard-phases (add-after 'unpack 'move-files-around (lambda _ @@ -806,8 +807,7 @@ using Guile's foreign function interface.") (mkdir-p "src/pfds") (for-each (lambda (file) (rename-file file - (string-append "src/pfds/" - file))) + (string-append "src/pfds/" file))) '("bbtrees.sls" "deques" "deques.sls" @@ -821,15 +821,6 @@ using Guile's foreign function interface.") "queues.sls" "sequences.sls" "sets.sls")) - - ;; In Guile <= 2.2.4, there's no way to tell 'guild - ;; compile' to accept the ".sls" extension. So... - (for-each (lambda (file) - (rename-file file - (string-append - (string-drop-right file 4) - ".scm"))) - (find-files "." "\\.sls$")) #t))))) (native-inputs `(("guile" ,guile-3.0))) @@ -862,7 +853,18 @@ Vicare Scheme and IronScheme. Right now it contains: (substitute-keyword-arguments (package-arguments guile-pfds) ((#:phases phases) `(modify-phases ,phases - (delete 'work-around-guile-bug))))))) + (delete 'work-around-guile-bug) + (add-after 'move-files-around 'sls->scm + (lambda _ + ;; In Guile <= 2.2.4, there's no way to tell 'guild + ;; compile' to accept the ".sls" extension. So... + (for-each (lambda (file) + (rename-file file + (string-append + (string-drop-right file 4) + ".scm"))) + (find-files "." "\\.sls$")) + #t)))))))) (define-public guile3.0-pfds (deprecated-package "guile3.0-pfds" guile-pfds)) -- 2.28.0