From patchwork Sat Oct 22 19:01:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 43869 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 D94A327BBEA; Mon, 24 Oct 2022 03:06:38 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 4469527BBE9 for ; Mon, 24 Oct 2022 03:06:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omjoc-0008RM-07 for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 18:51:34 -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 1omLzM-00009O-2g for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25: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 1omLzL-0002f2-Rn 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 1omLzL-0006jq-Me for guix-patches@gnu.org; Sat, 22 Oct 2022 17:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58100] [PATCH v2 7/8] gnu: cbqn-bootstrap: Install regular files rather than copying them recursively. 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:03 +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.166647385125777 (code B ref 58100); Sat, 22 Oct 2022 21:25:03 +0000 Received: (at 58100) by debbugs.gnu.org; 22 Oct 2022 21:24:11 +0000 Received: from localhost ([127.0.0.1]:42486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyU-0006hb-St for submit@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:11 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:34374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omLyQ-0006g3-4M for 58100@debbugs.gnu.org; Sat, 22 Oct 2022 17:24:06 -0400 Received: by mail-ed1-f66.google.com with SMTP id w8so15889061edc.1 for <58100@debbugs.gnu.org>; Sat, 22 Oct 2022 14:24:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:content-transfer-encoding:cc:to:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=Dib9ULOonmhfrMNzXx3dMPTXXH+NW2kIC76mWehjRLo=; b=FwE+nrQ1WazMd07pqEED9wSa9JjAt/oR9Ya7oSQPnZjXgPYEDhIhYOZdNAcKyuEr2U NJZdGHa9vfEmFUFgfO5JNrekEHt0Nj98b46xMcbygkSLLw+deS/7mctWgh/mpm4hxARL JqTcYnLJcSI7vR5NNktTlAt2Rf4ZiEgD8320cPb36p70SCbWabNyDJdgOBFFpvKVfy80 B5i+Oe3OZblu6HE/cAAobmVvSbQETxyrNEj9+jLalCXFa314hUhoIAmaw04yWJspzVTw +h9wm+hg1+CBXSNOx+G3wnBm+qEtxLXPIhlyHvgWMj8VTXouONDeJi/Y1vNMkU/3VTqS /8Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:content-transfer-encoding:cc:to:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Dib9ULOonmhfrMNzXx3dMPTXXH+NW2kIC76mWehjRLo=; b=sVbUA85igKVf4ojlE0CIbaO0pcIF8UPKj/elF/yyxRPcFFAgCYwCTrB4vNbuCmmn44 zXEWMNuGtN8k/ZjQH463PFCzEQEjqJNl2Z8tHgdLirmEzOI1z5MgjlS5YeSduTkUr4// YlGpS1fLfyEVFjVKBcWJi+QZLTUb6EHyA3wYpQkEyihwoCPYPRex+LMSY89H7cqHuCoQ y+j51a5cepzE5HbrOuzx2nDtqSm2eiM/1UKlp3bLW6Zm0ese4HuScOP2PZVvEDv8xNSR bCH7ZEj32KBQgXgT9BrxholXkOHLpWt6MkArkuPJn3kNn9le1Ui//jCW72p25IGtcxkb EtwQ== X-Gm-Message-State: ACrzQf2iesWEoG7aYDCzw4pswKfCdrWXlFrQLNjSCjH+ybTGtt5xf1Va 4Hqa7kYqGncbCB6my6EQ/gx6EaY+nB8= X-Google-Smtp-Source: AMsMyM5jN8dHEwM2W17svcv5i00cO7Qm/knu7WiBkhbOrFWRLXrU6FK3mInNA8mVUsmRdxre6XvXQA== X-Received: by 2002:a05:6402:518b:b0:45d:9a19:66d2 with SMTP id q11-20020a056402518b00b0045d9a1966d2mr23365431edd.43.1666473840658; Sat, 22 Oct 2022 14:24:00 -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.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Oct 2022 14:24:00 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 22 Oct 2022 21:01:34 +0200 MIME-Version: 1.0 Message-ID: <8948ad36694f74da7604fd0451ded04e775cdbe8.camel@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bqn.scm (cbqn-bootstrap)[arguments]: Reindent. <#:phases>{install}: Use ‘install-file’ rather than ‘copy-recursively’ for “bqn”. --- gnu/packages/bqn.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index 700175db16..2b59d5b6ac 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -140,22 +140,23 @@ (define cbqn-bootstrap "0w38fhwf20drkyijy6nfnhmc5g5gw0zmzgmy1q605x57znlj85a2")))) (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) - (copy-recursively "BQN" - (string-append #$output - "/bin/bqn"))))))) + (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")