From patchwork Mon May 9 06:02:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 2237 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 0A20F27BBEA; Mon, 9 May 2022 07:04:56 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 C15A427BBE9 for ; Mon, 9 May 2022 07:04:55 +0100 (BST) Received: from localhost ([::1]:42414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnwVq-0001NE-Ro for patchwork@mira.cbaines.net; Mon, 09 May 2022 02:04:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnwV1-00010e-7u for guix-patches@gnu.org; Mon, 09 May 2022 02:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33578) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnwV0-0004gA-Un for guix-patches@gnu.org; Mon, 09 May 2022 02:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnwV0-0000uT-RA for guix-patches@gnu.org; Mon, 09 May 2022 02:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55248] [PATCH v3 2/9] gnu: racket: Fix out-of-source build. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 May 2022 06:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55248 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55248@debbugs.gnu.org Cc: Liliana Marie Prikler , Maxime Devos , Philip McGrath , Liliana Marie Prikler Received: via spool by 55248-submit@debbugs.gnu.org id=B55248.16520762323433 (code B ref 55248); Mon, 09 May 2022 06:04:02 +0000 Received: (at 55248) by debbugs.gnu.org; 9 May 2022 06:03:52 +0000 Received: from localhost ([127.0.0.1]:55696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnwUq-0000tB-2m for submit@debbugs.gnu.org; Mon, 09 May 2022 02:03:52 -0400 Received: from mail-vs1-f51.google.com ([209.85.217.51]:46018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnwUe-0000sT-WC for 55248@debbugs.gnu.org; Mon, 09 May 2022 02:03:41 -0400 Received: by mail-vs1-f51.google.com with SMTP id e19so12827197vsu.12 for <55248@debbugs.gnu.org>; Sun, 08 May 2022 23:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tCGAYGqxnxsQJ22Fq13uH4OFi1mbolL+EAnq3xC2EgQ=; b=fXMeMILhGLxd1t9tiA5X5KEpQ3PJHlhYRmF5BfnDQW/qeY8FAfGyevGQe7ouWsocNE SdMXtf/UZkP/9JVbGnFvdjFL4d9azxV7vVGrV8eLCe+CVr1XTKp2NQNdjU7d5whZtF06 mEIBJubJOdMQJJJq5c9Zkxtuerc6BY1F7dxnpFdSEtfo4W3IFoyM8DVGOvxalxZPCPL6 9Oyhmb2yPdqhDLrnpDA+vm6SDcVeKVD6QCg2XjSG4IRxjvIY6CRT0Cr/Rayda04B+dpX AugHd20EPCR+LFe9gTcXy27ijkWtpdXs06bxHQhI/QVesgDPDuA4R293KMmp7QrdXAfn MUCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tCGAYGqxnxsQJ22Fq13uH4OFi1mbolL+EAnq3xC2EgQ=; b=4kUi41e4qhnYzUMg9bZHnoHksAEF+JpDusy///Lyl4PyP28kO69rYwgx5+KcZfcPRR XUro8BKFSCKyImlkp5xDOGrpEVuZpji++8srafZPBhX6xJK08oXHNjHiU/PcXxdMlfXm 0U8fz2TdnxnX7gacvk0ThX/G2RwDrFan7HZZ2rHGmqCO2VfBoo9HUMNzHnVWylHJiV69 IkXO2IVW6xslh/Z/VuXJhtPeOr5LNKZwa0pOjH9v8hgX8tMDvBXKqNKdYVLiYF4XYdk8 xT5XNUV3gD+ofZHG2Bs/QQU36lAqyKhvSVBrLEqU9O54VamNs4Eg84TpeAvR7lkLuyFU wZWg== X-Gm-Message-State: AOAM530AljUcpgXPHtHgN7JYUM1KW/XslRxZjrrgrjUGC5cS/lCjx5p9 rh1m+2+otPngydhH3yBVLaNcpDz7Wx/rzeCu X-Google-Smtp-Source: ABdhPJxXi9gZ9B6+RRblQ4P7RfXUFEoFH4GEPTWg0Ck9IGnyZqyP6zHTrqRO7JitutWz3AwzzT/FFw== X-Received: by 2002:a67:e153:0:b0:32d:15c:71d6 with SMTP id o19-20020a67e153000000b0032d015c71d6mr7282519vsl.36.1652076215459; Sun, 08 May 2022 23:03:35 -0700 (PDT) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id o12-20020a056122178c00b0034e6f1fd05fsm1287823vkf.41.2022.05.08.23.03.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 May 2022 23:03:35 -0700 (PDT) From: Philip McGrath Date: Mon, 9 May 2022 02:02:43 -0400 Message-Id: X-Mailer: git-send-email 2.32.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/racket.scm (racket-vm-cgc)[arguments]: Supply '#:out-of-source? #t'. Wrap 'install-license-files' to work around limitation. --- gnu/packages/racket.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 7d51707156..8438945ba0 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -276,8 +276,9 @@ (define-public racket-vm-cgc ;; main-distribution-test that aren't part of the main ;; distribution. #:tests? #f - ;; Upstream recommends #:out-of-source?, and it does - ;; help with debugging, but it confuses `install-license-files`. + ;; Upstream recommends #:out-of-source?, and it + ;; helps a lot with debugging. + #:out-of-source? #t #:modules '((ice-9 match) (ice-9 regex) (guix build gnu-build-system) @@ -314,7 +315,18 @@ (define-public racket-vm-cgc #f))))))) (add-before 'configure 'chdir (lambda _ - (chdir "racket/src")))))) + (chdir "racket/src"))) + (replace 'install-license-files + ;; The #:out-of-source? mode for install-license-files fails + ;; to find the srcdir: as a workaround, navigate there ourselves. + (let ((install-license-files + (assoc-ref %standard-phases 'install-license-files))) + (lambda args + (with-directory-excursion "../src" + (apply install-license-files + `(,@args + ;; if there are duplicate keywords, last is used + #:out-of-source? #f))))))))) (home-page "https://racket-lang.org") (synopsis "Old Racket implementation used for bootstrapping") (description "This variant of the Racket BC (``before Chez'' or