From patchwork Sat Feb 10 23:28:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aecepoglu X-Patchwork-Id: 59987 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 81C0C27BBE9; Sat, 10 Feb 2024 23:26:21 +0000 (GMT) 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,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,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 6B99C27BBE2 for ; Sat, 10 Feb 2024 23:26:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rYwjF-0007LH-Qm; Sat, 10 Feb 2024 18:25:49 -0500 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 1rYwjE-0007KM-6B for guix-patches@gnu.org; Sat, 10 Feb 2024 18:25:48 -0500 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 1rYwjD-0007Js-UL for guix-patches@gnu.org; Sat, 10 Feb 2024 18:25:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rYwjT-0002E3-Nz for guix-patches@gnu.org; Sat, 10 Feb 2024 18:26:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69023] [PATCH 5/5] gnu: bqn: Update cbqn. Resent-From: aecepoglu Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 10 Feb 2024 23:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69023 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69023@debbugs.gnu.org Cc: aecepoglu Received: via spool by 69023-submit@debbugs.gnu.org id=B69023.17076075438477 (code B ref 69023); Sat, 10 Feb 2024 23:26:03 +0000 Received: (at 69023) by debbugs.gnu.org; 10 Feb 2024 23:25:43 +0000 Received: from localhost ([127.0.0.1]:51520 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYwj9-0002Cd-Cg for submit@debbugs.gnu.org; Sat, 10 Feb 2024 18:25:43 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:45835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYwj7-0002Bx-60 for 69023@debbugs.gnu.org; Sat, 10 Feb 2024 18:25:41 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 6136932004CE; Sat, 10 Feb 2024 18:25:19 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sat, 10 Feb 2024 18:25:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.fm; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm3; t=1707607518; x= 1707693918; bh=7HTXpGEnwKY4gZK3GyP4RPejUBmkjvgjOpkv6SVRcv8=; b=o DSCKiyS4z0p9hPLFP/pzcAYlK3auzl/aCuKTGTSQ8ehjMax+cQ2tAEJp+i6lTsw3 SFCfTH7gKgG4SM5QUHHLicetRLsm7LN987wbApnjN0sxUZ4uoNM9xwJqQ91JEOcz BaIG+bvlXhciSiF9jN3iWwrSIgZHM1Fy8wLf4eV/xiKTT/e4LcJ+pyKwmrZpjrr3 DDUQdzaBVcRDXhD7Qom3xrK3vbXHhZuMo3kEbazRWtrmPQSpZxN2qRNrY+rYauBE 3tbrEwKP8iWs0IX+nfn9+z/3accO0AZ4wivjXn/IKKaeJLoSbR8TIN2WPyUVQux+ XPp6wvFq6dmcKBsOJujUQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1707607518; x= 1707693918; bh=7HTXpGEnwKY4gZK3GyP4RPejUBmkjvgjOpkv6SVRcv8=; b=d ibEl4/OO8mHT0rNeh36JDsGnuUHUmEXSKKeATKXBK1mxTTtW/pZgPXXOspY5zwCR iImYVmCszYacv2J2YGbH1kP823wUFuDzTl453ELAMxyURBnYAHNYwnf8b+uVVUml 4xpWyctrEqL1JVvQ+GBXEYz3uAlbIsnIBxLFtZZ3mmI1WYGqHp00/cRZU2rWhKSI wJOMHUhmHKaFN6vwxu8LxvHm+1CffDJ1GzOy1tGU4Y9Qs9s+X9/f3tvECJmsmZsp Jty/ch1Za1Gt0txJ/pUWdiITNjItGByod5iGkzxyJK+JxihEaDB2i3YjTpdDiecS cG1uGMwkUFfYHQyGwcXBA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddtgdduudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekre dtredttdenucfhrhhomheprggvtggvphhoghhluhcuoegrvggtvghpohhglhhusehfrghs thhmrghilhdrfhhmqeenucggtffrrghtthgvrhhnpeejgfeufeefleevvdeihffhtdeuie etieffjefhkedtleelhfffffekjedviedvudenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpegrvggtvghpohhglhhusehfrghsthhmrghilhdrfh hm X-ME-Proxy: Feedback-ID: i7bb4409f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 10 Feb 2024 18:25:18 -0500 (EST) From: aecepoglu Date: Sat, 10 Feb 2024 23:28:11 +0000 Message-ID: <49846553277b9a80f952daf89c4059ddfa5a0d49.1707607099.git.aecepoglu@fastmail.fm> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bqn.scm (cbqn): Update cbqn. Update version. Override 'generate-bytecode to rely on cbqn-bootstrap instead of dbqn. Change-Id: I1660d218960e7395f4c10983d840e3fa4b451d14 --- gnu/packages/bqn.scm | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 6d3ec43a0f..66c70a8516 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -209,9 +209,16 @@ (define-public cbqn (list #:tests?) (package-arguments cbqn-bootstrap)) ((#:make-flags flags #~(list)) - #~(cons* "shared-o3" "o3" #$flags)) + #~(append #$flags '("shared-o3" "o3"))) ((#:phases phases #~%standard-phases) #~(modify-phases #$phases + (replace 'generate-bytecode + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append "./build/bytecodeLocal/gen")) + (system (string-append #+cbqn-bootstrap + "/bin/bqn ./build/genRuntime " + #+bqn-sources " ./build/bytecodeLocal"))))) (replace 'check (lambda* (#:key inputs tests? #:allow-other-keys) (when tests? @@ -219,25 +226,21 @@ (define-public cbqn #+bqn-sources "/test/this.bqn\"")) (map (lambda (x) - (system (string-append "./BQN ./test/" x - ".bqn"))) + (system (string-append "./BQN ./test/" x ".bqn"))) '("cmp" "equal" "copy" "random")) (system "make -C test/ffi")))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((bin (string-append (assoc-ref outputs "out") - "/bin")) - (lib (string-append (assoc-ref outputs "lib") - "/lib")) - (include (string-append (assoc-ref outputs "lib") - "/include"))) - (mkdir-p bin) - (rename-file "BQN" "bqn") - (install-file "bqn" bin) - (install-file "libcbqn.so" lib) - (install-file "include/bqnffi.h" include)))))))) - (native-inputs (list dbqn + (add-after 'install 'install-lib-stuff + (lambda* (#:key outputs #:allow-other-keys) + (let* ((lib (string-append (assoc-ref outputs "lib") + "/lib")) + (include (string-append (assoc-ref outputs "lib") + "/include"))) + (install-file "libcbqn.so" lib) + (install-file "include/bqnffi.h" include)))))))) + (native-inputs (list cbqn-bootstrap + singeli bqn-sources libffi)) + (inputs (list libffi)) (properties `((tunable? . #t)))))