From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id gAfsMQhAMGZSZAEA62LTzQ:P1 (envelope-from ) for ; Tue, 30 Apr 2024 02:49:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id gAfsMQhAMGZSZAEA62LTzQ (envelope-from ) for ; Tue, 30 Apr 2024 02:49:12 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fastmail.fm header.s=fm3 header.b="H layrBs"; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b="C cIu57A"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fastmail.fm (policy=none); 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714438152; a=rsa-sha256; cv=none; b=YnIZPgOizsTBrMYukzJ8UgIXjOtaE6rfEQ6EU7V2dI/+3jqz2izDYwIwhJbvLbxyLpY/t0 K2W/GS/o6najXpgSYn+73D3HsNZ4zs+GFUEsUdZz+cNBwKraaRxdRDFPgFcgFt/8Sy93xE h1PpWwmCi/OAxFmUCSO9HP/IGGdLBUh3SLZT7l4zWhYNsy+/ong0zO8GicGFu7/csxEGin G8Y9qqP5bta+CE5VaMVMmALKxpmo0hGuwldmixlhlYK+2DYwMki69FJIyhtwHYBgaSh6BG bVfGufVCI8TF5gN2pmstNWODW0Iml4fAeeahZuJFsOpCYhjMFf3tfiznQs51fw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=fastmail.fm header.s=fm3 header.b="H layrBs"; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b="C cIu57A"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=fastmail.fm (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1714438152; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=teL047MOnhW1PzfA2sPadrRYClZmXsT6ZnyB3FdSO2s=; b=PxLj7tPVuVW+vo89nuPgJkZb3kEA2nd/x2EOmCl99/KgDJK/ZQ/nH+SIqOMfcDs3ww75rb MgFlnmSpQUukkYY/ad0CvlDA+cpQ2uDEokOEWv5f7ZStJ6Dp26+Ih7xAA7XKDlADXFLVfj JV+pIjOSmHc0wHPpSdmkTOpnmdmQM8yY2AdWQjfdt4ZD7wvE+9f5gXHqjmRkOKfaHKtwoO bxrwhiJUDDB+b7+CaJt6UT97ScER58eZJY1zBNd612rLnuC8G2IBKAe/IK5HqB7rd8BnJi TW273nWwwlv9mVVVCqJNU91p6pUCvKSp8AwxfA03TQDzufjQaGmtk/laHkXSGg== 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 97B0D1B8DF for ; Tue, 30 Apr 2024 02:49:12 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1bfz-0006wA-QX; Mon, 29 Apr 2024 20:48:55 -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 1s1bfp-0006rI-Pk for guix-patches@gnu.org; Mon, 29 Apr 2024 20:48:45 -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 1s1bfp-0002sJ-3v for guix-patches@gnu.org; Mon, 29 Apr 2024 20:48:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s1bg8-0005sJ-Ac for guix-patches@gnu.org; Mon, 29 Apr 2024 20:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69023] [PATCH v2 5/5] gnu: bqn: Update cbqn. Resent-From: aecepoglu Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Apr 2024 00:49:04 +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 , liliana.prikler@gmail.com Received: via spool by 69023-submit@debbugs.gnu.org id=B69023.171443813122479 (code B ref 69023); Tue, 30 Apr 2024 00:49:04 +0000 Received: (at 69023) by debbugs.gnu.org; 30 Apr 2024 00:48:51 +0000 Received: from localhost ([127.0.0.1]:58973 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1bfu-0005qP-KY for submit@debbugs.gnu.org; Mon, 29 Apr 2024 20:48:51 -0400 Received: from fhigh7-smtp.messagingengine.com ([103.168.172.158]:51511) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1bfm-0005of-0H for 69023@debbugs.gnu.org; Mon, 29 Apr 2024 20:48:42 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailfhigh.nyi.internal (Postfix) with ESMTP id 8E0B41140161; Mon, 29 Apr 2024 20:48:16 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 29 Apr 2024 20:48:16 -0400 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=1714438096; x= 1714524496; bh=teL047MOnhW1PzfA2sPadrRYClZmXsT6ZnyB3FdSO2s=; b=H layrBsPVQ8BkAQRxpTZ0H6IcEn15gmdOf8hVxxBDWtOJkI537ajXg8IpDRQZeQJl 06sQdm/8XgPePsdr7wSZgj+rpWrvBKddUTITnKwIoDrbyng2gQpd8wyLQ/VaxJdM Kxas2XNk0JVph1YnvQh3tWil5N80rXP1v4+YhiKEK5gJAge3G0bDO9K4VulFKWc5 jHJNvHq606F/TQHeIljcKRyRA/2jnZZ0Cx/D9ly8xhq6k8fn+k1Co3n1h3ZSROKN t+G7mudpWqyvjrSeOvqqE/M4Z90JDcV4+V/JQqFfUg6e0thH9zDrWbVBfiUdT900 j1J8Hl1lLEt+9aDQURUhA== 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=1714438096; x= 1714524496; bh=teL047MOnhW1PzfA2sPadrRYClZmXsT6ZnyB3FdSO2s=; b=C cIu57AhYkspMNK497g+EyOyOPKVLsamQ/h8THXTkOcZxC+PsNUI++jQlRzOipVz+ 3y1G4RmxtslnylS+ph2AKBXT29BjZ92RBUFfCnozqQoPpl+FgYkCt3RBGGU3Q01S BMVFoufK4XFm1MEdxnsYAPWjkbhlOe3SaIpnVXILe244TAtVOzIcEXnVpEEdKSH2 RBCW7VsoWS2BxU3JhOfHXT9AfwJQ1+1/ssT8UPMM7KmbNRclJO/F0sw6FP+niJYC UKBIuhTWbsmJKGj11ouf5IR25nX3Kr18CyTC8NukI9i+8l/0gklK6G2f3vvzeNEc RK++StEI5r0vnruaWL5MQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdduvddgfeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpegrvggtvghpohhglhhuuceorggvtggvphhoghhluhesfhgr shhtmhgrihhlrdhfmheqnecuggftrfgrthhtvghrnhepjefgueeffeelvedviefhhfdtue eiteeiffejhfektdellefhffffkeejvdeivddunecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomheprggvtggvphhoghhluhesfhgrshhtmhgrihhlrd hfmh X-ME-Proxy: Feedback-ID: i7bb4409f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Apr 2024 20:48:15 -0400 (EDT) From: aecepoglu Date: Tue, 30 Apr 2024 01:50:34 +0100 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+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-Queue-Id: 97B0D1B8DF X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: 4.01 X-Spam-Score: 4.01 X-TUID: IyRFlAfmTuwo * 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 aca30f38b7..23c5253046 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))))) -- 2.44.0