From patchwork Tue Apr 25 02:06:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 49480 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 D941E27BBE9; Tue, 25 Apr 2023 03:08:21 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 DD9B827BBE2 for ; Tue, 25 Apr 2023 03:08:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pr86G-0005gp-Ib; Mon, 24 Apr 2023 22:08:13 -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 1pr868-0005bb-DX for guix-patches@gnu.org; Mon, 24 Apr 2023 22:08:04 -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 1pr867-0003Yw-Rn for guix-patches@gnu.org; Mon, 24 Apr 2023 22:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pr867-0001Rj-Eq; Mon, 24 Apr 2023 22:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63061] [PATCH 3/3] gnu: Add s7. Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: jgart@dismail.de, guix-patches@gnu.org Resent-Date: Tue, 25 Apr 2023 02:08:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63061 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63061@debbugs.gnu.org Cc: jgart@dismail.de X-Debbugs-Original-Xcc: jgart@dismail.de Received: via spool by 63061-submit@debbugs.gnu.org id=B63061.16823884355487 (code B ref 63061); Tue, 25 Apr 2023 02:08:03 +0000 Received: (at 63061) by debbugs.gnu.org; 25 Apr 2023 02:07:15 +0000 Received: from localhost ([127.0.0.1]:50836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pr85K-0001QR-Mu for submit@debbugs.gnu.org; Mon, 24 Apr 2023 22:07:15 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:35992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pr85D-0001Pl-VG for 63061@debbugs.gnu.org; Mon, 24 Apr 2023 22:07:08 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Q553S3SmVz9smH for <63061@debbugs.gnu.org>; Tue, 25 Apr 2023 04:07:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1682388420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OnmbaJxLWZJ6jyhFzfkaEraMBmXMjrr5dmkm4+Ymdsg=; b=wp5uQv4HikWKOAymYxXDL7gHMFkfihv5eGm0qJLn+4QVh8bVF9Tz6alAAWQW2dauQc5qJX fdxbv4v3ObACrsTqFTE2ky9orUwNI6rPlLM4LDG086Zyk7+A2PefNpZXaU6WOqCDj3FeSr Un7E2xaudaJEQKf6gg8hYZN8yGNSYwdOUKsy4NTg/QMrR6xSDigmIrqiSopKL6VHiSZXT5 UzqFluR6H9trGWxEjjViyxDApEdWro4M3nVSs16TFckRhunDiprNe5QTYfjfkmMhBuY+lF dnMA/a0Sja0ACVq+vp1UaA14S0GwCSl/fyoelnMCXUSpsvMGWuUWsgnS0bKb5w== Date: Tue, 25 Apr 2023 02:06:53 +0000 Message-Id: <20230425020653.10035-3-antero@mailbox.org> In-Reply-To: <20230425020653.10035-1-antero@mailbox.org> References: <20230425020653.10035-1-antero@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: bm5q4f6omytdtdck19pynnpin1k76jt9 X-MBO-RS-ID: 7cdd58d49ec52b1433a 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: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches X-Patchwork-Original-From: Antero Mejr via Guix-patches via From: Antero Mejr 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/lisp.scm (s7): New variable. --- gnu/packages/lisp.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 1b05417bc9..7c4064da30 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1571,3 +1571,32 @@ (define-public s7-bootstrap libraries, no run-time init files, and no configuration scripts. It can also be built as a stand-alone REPL interpreter.") (license license:bsd-0))))) + +(define-public s7 + (package + (inherit s7-bootstrap) + (name "s7") + (arguments + (substitute-keyword-arguments (package-arguments s7-bootstrap) + ((#:tests? _) #t) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "s7.c" + (("libc_s7.so") + (string-append #$output "/lib/libc_s7.so"))))) + (add-after 'build 'build-full + (lambda _ + (invoke "repl" "./libc.scm"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "repl" "./s7test.scm")))) + (add-after 'install 'install-full + (lambda _ + (install-file "libc_s7.so" + (string-append #$output "/lib/")) + (delete-file (string-append #$output "/bin/ffitest")))))))) + (native-inputs (list s7-bootstrap)) + (properties (alist-delete 'hidden? (package-properties s7-bootstrap)))))