From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id GLqjJYITVmOPWgAAbAwnHQ (envelope-from ) for ; Mon, 24 Oct 2022 06:24:34 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id kIVqJYITVmNCVwEAauVa8A (envelope-from ) for ; Mon, 24 Oct 2022 06:24:34 +0200 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 3BBDA29DD1 for ; Mon, 24 Oct 2022 06:24:34 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omjnd-0008JP-E9 for larch@yhetil.org; Sun, 23 Oct 2022 18:50:33 -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 1omLzL-00009B-Ax for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:03 -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 1omLzL-0002Zt-31 for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omLzK-0006jc-Sw for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58100] [PATCH v2 4/8] gnu: cbqn: Rewrite in terms of cbqn-bootstrap. References: <878rm6hs4d.fsf@gmail.com> In-Reply-To: <878rm6hs4d.fsf@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Oct 2022 21:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58100 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 58100@debbugs.gnu.org Cc: Christopher Rodriguez Received: via spool by 58100-submit@debbugs.gnu.org id=B58100.166647385025763 (code B ref 58100); Sat, 22 Oct 2022 21:25:02 +0000 Received: (at 58100) by debbugs.gnu.org; 22 Oct 2022 21:24:10 +0000 Received: from localhost ([127.0.0.1]:42482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyU-0006hM-6O for submit@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:10 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:44999) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyO-0006fy-5i for 58100@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:05 -0400 Received: by mail-ed1-f66.google.com with SMTP id a5so5099294edb.11 for <58100@debbugs.gnu.org>; Sat, 22 Oct 2022 14:24:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:cc:to:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=ogHvUmLOKA9T7/2kSx7gLAcVn3GjZ8gn+JV8lP+q2hI=; b=WtpOAW6sts9Khmblt/cLjT+AoKTtiF4yIDE5upbx4mCGU4PKRjXJXJFLbyUrOmu3Wq J+xSbu9aHnnAHlLAe8PcXUJ0/5Jcp7gG2SPylYoMHCWRRIhWjEd3H1G6zHIlAEx3NafP lTYMLiphySeG//wrpAz74oeoGvIVYrYblYIm2cIXYcRG/WLuhBy0XFg4NLTYk2WCxc1r tqgjYj6vWJ3v9qoRCkLFAU32efsKIE5FsmTQWLbd3FFr6v9JRIq93eNAMWbKYnnbX4sx KoNaYKHIsNodWBGA6+3ru52a4GgozWuy4A6AlBBZw0pCJK6u8NcA+N7jsck/T22VqCYt FJSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:cc:to:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ogHvUmLOKA9T7/2kSx7gLAcVn3GjZ8gn+JV8lP+q2hI=; b=c/Ht8T/GLlv9le+1AfrnVjP3/4pxO2PWcy0lH7RdMTF0LXAP+S3Ahi/fGsZujctcOn WjzTSo4u+jpTC46Ilk4BHPLj1HMUSUpK8odSMgVOq4j9lJtme4oiLWiTA+m+sz+lqxe2 zSINFnkuHBvSbcX9KzM67QhqB5f4MJxEjopIUIZytd79+gltf2WpYfLq6Uy2B4qIVZRe Ta8MwdG6ZuYTXUoN7GE3ehBql58xSI9QTyWPNF6q9G2DT5mGWYH1gCzvimN3cP0JcaRr Bo0OYy04+a82qP50LWbm14HmIWrEh2oO7bqeIBIkArFi1WyKuJCyO7DCbFm1yJ8gMPMO qygw== X-Gm-Message-State: ACrzQf3N99mefAMSpie7Qc2E49Icm1fLIDgY3WAMNhlesYdRaXgtCyfQ lCK0UdVdPIVuJnfANEq0mWnMouJSGMs= X-Google-Smtp-Source: AMsMyM6Ef2lThzxScjytyeMFOrgWxKsTWPX7MkdDwUPLC7rZPa34VRyKYCpsAYkYEueTS8Dc+tQzXQ== X-Received: by 2002:a05:6402:5ca:b0:445:c80a:3c2 with SMTP id n10-20020a05640205ca00b00445c80a03c2mr23740307edx.247.1666473838693; Sat, 22 Oct 2022 14:23:58 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id kv20-20020a17090778d400b0078d261f9f44sm13313506ejc.224.2022.10.22.14.23.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Oct 2022 14:23:58 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 22 Oct 2022 20:34:37 +0200 Content-Transfer-Encoding: 7bit Message-ID: <69d947544bdbcec3c1eb06ff349c7b467b5b759b.camel@gmail.com> 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1666585474; 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=ogHvUmLOKA9T7/2kSx7gLAcVn3GjZ8gn+JV8lP+q2hI=; b=sQrXDcfTUWWKoqcbEWIP7GGF2KmRz6Qjzocko4EnbLe6rmve4j466yjktH8EIBTLNNpcAm FZYJfBF66ilngEcOOxuOLsYkJ4VOluOpDd9lk6vZT+JVEwx42nFuchkbSYAjmZZ4rQ7bHp xmrD6U2Mo+cjN/9756Q30QET7Gl0nOCWhbqrbU9kCOe9CKfderYUf7RNwHmSn/diQw49ur xqaBATqhjO4C6OR9Hd/GetH3cPd5ArRvBWKyVAmQjmsK34EjxMrqWzv4z1yYUpj3JKggrf RaEeYECnDKOZ+W7O+Y9n0VNLE2HKiXuW2OBzt2TjfZWOwq1v0OW3/3bcHbdcfA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1666585474; a=rsa-sha256; cv=none; b=VlpfT8q1zKQRy4SIJ3KNZ3ZTHl45n3zTlOqqMBtgA41OAnmkuS9E1yTIu6FNDuCOsSsK+A pVQu47h+/3Hr94FAiD+ToCCfy5AnM2SVU6ckKGG0PA26iq3qIwpKcUCfZzKG7FVFndKA/Y KeWAeeWAj0WGUCfYctpqMPO2/63RXIOuXXqA+dNJCIsNxhSzGLoKHkPZwP41UcdKK7sul0 WJlSM65XJG7EQCn5IE0barmkpw5kEqrr57DBs8m4i0ogs9s71lcxvftCau9Z2lcbTl74+m PYgemsNmVEaT/AHdhwHz2LTpszyk9GuLkMmpQJG1TSnLnvt7yaHi2Lj6NVvzMQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=WtpOAW6s; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (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" X-Migadu-Spam-Score: 7.49 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=WtpOAW6s; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (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" X-Migadu-Queue-Id: 3BBDA29DD1 X-Spam-Score: 7.49 X-Migadu-Scanner: scn0.migadu.com X-TUID: u/ujsnkSvHVt * gnu/packages/bqn.scm (cbqn)[arguments]: Use substitute-keyword-arguments to preserve options from cbqn-bootstrap. --- gnu/packages/bqn.scm | 59 +++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 8a1b1dfba2..bc714c3d49 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -171,37 +171,34 @@ (define-public cbqn (name "cbqn") (outputs '("out" "lib")) (arguments - (list #:make-flags '(list "shared-o3" "o3") - #: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 'check - (lambda* (#:key inputs tests? #:allow-other-keys) - (when tests? - (system (string-append "./BQN -M 1000 \"" - #+bqn-sources - "/test/this.bqn\"")) - (map (lambda (x) - (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"))) - (mkdir-p bin) - (copy-recursively "BQN" - (string-append bin "/bqn")) - (install-file "libcbqn.so" lib))))))) + (substitute-keyword-arguments (strip-keyword-arguments + (list #:tests?) + (package-arguments cbqn-bootstrap)) + ((#:make-flags flags #~(list)) + #~(cons* "shared-o3" "o3" #$flags)) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (replace 'check + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (system (string-append "./BQN -M 1000 \"" + #+bqn-sources + "/test/this.bqn\"")) + (map (lambda (x) + (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"))) + (mkdir-p bin) + (copy-recursively "BQN" + (string-append bin "/bqn")) + (install-file "libcbqn.so" lib)))))))) (native-inputs (list dbqn bqn-sources libffi -- 2.38.0