From patchwork Sat Feb 10 23:28:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aecepoglu X-Patchwork-Id: 59990 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 8DDC927BBE2; Sat, 10 Feb 2024 23:26:36 +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.6 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,URIBL_SBL_A autolearn=ham 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 980AA27BBE9 for ; Sat, 10 Feb 2024 23:26:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rYwjF-0007LE-2j; 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 1rYwjD-0007K0-OF for guix-patches@gnu.org; Sat, 10 Feb 2024 18:25:47 -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-0007Jm-Fi 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-0002Dv-9Q for guix-patches@gnu.org; Sat, 10 Feb 2024 18:26:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69023] [PATCH 4/5] gnu: bqn: Update cbqn-bootstrap. 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.17076075408457 (code B ref 69023); Sat, 10 Feb 2024 23:26:03 +0000 Received: (at 69023) by debbugs.gnu.org; 10 Feb 2024 23:25:40 +0000 Received: from localhost ([127.0.0.1]:51509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYwj5-0002CJ-Rn for submit@debbugs.gnu.org; Sat, 10 Feb 2024 18:25:40 -0500 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:59915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYwj3-0002BZ-JX for 69023@debbugs.gnu.org; Sat, 10 Feb 2024 18:25:38 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id C8E57320099B; Sat, 10 Feb 2024 18:25:15 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Sat, 10 Feb 2024 18:25:16 -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=1707607515; x= 1707693915; bh=v6sXTF6Si1Z1CNUb24mhemqwgJVKb1gUDTlpuJQJqeU=; b=M CPlc/qG3rfpsUOywx2RIocHrF4+09mTq9EXzlssXJ5HXYrIMZvo1equACmuxUstm z8xJX7PFG3F2SqrufOAiGxHLpejkSrNe9GJ2jNPCXanxxD2soYsb/qW90JtyXA2D Gt84nqsEM6leYUK0GYoMnACw50UkEg44+8FIqKAom1Q8+u2nvIqGUQfUEJL36U9w X5OS27Of86jXcyzVvL5LtiYM9DlsE1LONENkHxjCD0eox3ML3GXIpYdWNmFRwIzg MwLExzMrHmqqA6z2uslj17jyEWKfWei8JxnwOT6fus6UYc+Z8sBOigONdXexOXK5 EA5u9LsYN+rnMGD7bJCng== 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=1707607515; x= 1707693915; bh=v6sXTF6Si1Z1CNUb24mhemqwgJVKb1gUDTlpuJQJqeU=; b=C OMlhWNKArnl8f/4JAM2DophMu32CFcRL810DPNuKMh123GqrEgG22SFDgisdeGGI YarzBT063zRLD38GOBeaU8rBzglvWf/eR+Zg50uh+qiGAKZCUcMQ/7zL4RLNAeEQ +by3Ql6y66iSxWqfO58Hk6p3u4X0GuNQGiCm1FrWEX9xlAMDAJSuPArO3hMTxfh1 gD2ZJ3NFuwrN92LMItHmcDO9onoBEyRfdvCo/kbMSgyOGLjhzyasKxxK3AwdHtKD 70ghJTn3fT4mW5q98BXVmEx3HRQHnxfOMwtt0tVuR7G3SNSjsIzrgXOEeQi7wumI 7A5OS5nrrDEvx/VmJTA2A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddtgddutdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecuogfuuhhsphgvtghtffhomhgrihhnucdlgeelmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpegrvggtvghp ohhglhhuuceorggvtggvphhoghhluhesfhgrshhtmhgrihhlrdhfmheqnecuggftrfgrth htvghrnheptddttdegveefudekjedvudeggfdvheetjeeuteevtdetgfekieegueefleef vddtnecuffhomhgrihhnpehgihhthhhusgdrtghomhdpghhithhhuhgsrdhiohenucevlh hushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrvggtvghpohhg lhhusehfrghsthhmrghilhdrfhhm X-ME-Proxy: Feedback-ID: i7bb4409f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 10 Feb 2024 18:25:14 -0500 (EST) From: aecepoglu Date: Sat, 10 Feb 2024 23:28:10 +0000 Message-ID: <8f847b0c66450efeb6f958bd19258b95240eaf4f.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-bootstrap): Update cbqn-bootstrap version. Pass make flags to disable git submodules, disable REPLXX dependency. Update system invocation to generate bytecode. Add 'install phase (carried over from cbqn) so other packages can use cbqn-bootstrap to generate bytecode. Change-Id: I115737006ef56a90e643c00009155b02a22bf0b1 --- gnu/packages/bqn.scm | 88 ++++++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 39 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 9623fd5b57..6d3ec43a0f 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -147,47 +147,57 @@ (define bqn-sources (sha256 (base32 "0jhrazwp4s1a0pzrzyxi7szpchp4avqsvpmslfsgk3c88wf57q6b"))))) (define cbqn-bootstrap - (let* ((revision "2") - (commit "66584ce1491d300746963b8ed17170348b2a03e6")) - (package - (name "cbqn-bootstrap") - (version (git-version "0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dzaima/CBQN") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "13gg96aa56b8k08bjvv8i0f5nxrah2sij7g6pg7i21fdv08rd9iv")))) - (build-system gnu-build-system) - (arguments - (list - #:tests? #f ; skipping tests for bootstrap - #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) - #:phases - #~(modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'generate-bytecode - (lambda* (#:key inputs #:allow-other-keys) - (system (string-append #+dbqn - "/bin/dbqn ./genRuntime " - #+bqn-sources)))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append #$output "/bin")) - (chmod "BQN" #o755) - (rename-file "BQN" "bqn") - (install-file "bqn" (string-append #$output "/bin"))))))) - (native-inputs (list dbqn bqn-sources)) - (inputs (list icedtea-8 libffi)) - (synopsis "BQN implementation in C") - (description "This package provides the reference implementation of + (package + (name "cbqn-bootstrap") + (version "0.6.0") + (outputs '("out")) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dzaima/CBQN") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qh5hv76bj55ajna8smwniqfa1nmnyqahk40in5bzjsx3vvikpw5")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f + #:make-flags #~(list (string-append "version=" + #$version) + (string-append "CC=" + #$(cc-for-target)) "REPLXX=0" + "nogit=1" "notui=1") + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'generate-bytecode + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append "./build/bytecodeLocal/gen")) + (system (string-append #+dbqn + "/bin/dbqn ./build/genRuntime " + #+bqn-sources " " "./build/bytecodeLocal"))))) + (add-after 'generate-bytecode 'symlink-singeli + (lambda* (#:key inputs outputs #:allow-other-keys) + (symlink (string-append (assoc-ref inputs "singeli") + "/lib") "build/singeliLocal"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append #$output "/bin")) + (chmod "BQN" #o755) + (rename-file "BQN" "bqn") + (install-file "bqn" + (string-append #$output "/bin"))))))) + (native-inputs (list singeli dbqn bqn-sources)) + (inputs (list icedtea-8 libffi)) + (synopsis "BQN implementation in C") + (description + "This package provides the reference implementation of @uref{https://mlochbaum.github.io/BQN/, BQN}, a programming language inspired by APL.") - (home-page "https://mlochbaum.github.io/BQN/") - (license license:gpl3)))) + (home-page "https://mlochbaum.github.io/BQN/") + (license license:gpl3))) (define-public cbqn (package