From patchwork Tue May 3 18:33:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 39108 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 4E70B27BBEA; Tue, 3 May 2022 19:36:27 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 E710F27BBE9 for ; Tue, 3 May 2022 19:36:26 +0100 (BST) Received: from localhost ([::1]:36520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlxNp-0000fs-QO for patchwork@mira.cbaines.net; Tue, 03 May 2022 14:36:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlxMU-00009w-MJ for guix-patches@gnu.org; Tue, 03 May 2022 14:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47160) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nlxMU-00071V-Cd for guix-patches@gnu.org; Tue, 03 May 2022 14:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nlxMU-0002nF-8g for guix-patches@gnu.org; Tue, 03 May 2022 14:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55248] [PATCH 2/7] gnu: racket: Fix out-of-source build. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 May 2022 18:35: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: Philip McGrath Received: via spool by 55248-submit@debbugs.gnu.org id=B55248.165160288110639 (code B ref 55248); Tue, 03 May 2022 18:35:02 +0000 Received: (at 55248) by debbugs.gnu.org; 3 May 2022 18:34:41 +0000 Received: from localhost ([127.0.0.1]:41042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlxM9-0002lQ-5c for submit@debbugs.gnu.org; Tue, 03 May 2022 14:34:41 -0400 Received: from mail-vs1-f42.google.com ([209.85.217.42]:36607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nlxM1-0002ko-T9 for 55248@debbugs.gnu.org; Tue, 03 May 2022 14:34:34 -0400 Received: by mail-vs1-f42.google.com with SMTP id a127so17318198vsa.3 for <55248@debbugs.gnu.org>; Tue, 03 May 2022 11:34:33 -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=BC5GQY0TXltZBMOkoXODUxQlNsYii5czqkkZnBMyZ8A=; b=So01hS0avRQyq5BR0bZJHikyiz3xrEh5Om5n8810uteBCKnot9WSJhkfZdxB9OcUf4 gNxQ34KwfiYPvufbKeA0jwOKyGBo0qPQq2baymfh3CRB+Cpc+8FPFYka1tLHT9YkQ2L8 CsVl9fwJVohWO//fz5lXU5nPC5es1rVLxf/3JzL+lDVh1+ZOM7HXsyKZl3Zcs6vVXxIL tBIlNYSFcVILgfFuvzqHk404M8m5SXs+O0iDVMwCzXisrxnuXa9CwASP1ZXIYpir475m yJFRey4it5A14i1gI0zdUXM2RcG0EZboJTzSob+6y1YPPj20f0UVlUWvpOmC1aO/98e9 ErgQ== 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=BC5GQY0TXltZBMOkoXODUxQlNsYii5czqkkZnBMyZ8A=; b=empu5H/a4LaCQUFaJ2oC0TCVXdZ5Coprd6PPAn6BkjjWse41bBafqUD4Apj2DiJOna XTcWFsBpr0U2YC8vhrw0B/JshgjqPq182YdXt+0B3HA/EI+JIwxhXbjI5axdtRKn77lC 6JsSNcNLp8tJ/zu76J7i1Iu1xX8VhkHqfSgskoJHXCZaELfwDA7t73fB3/3s//IcVRu0 /B48pgsFPNktEUGcKrI6C7/EYPh0NFq/OnNBYjYANxt4vug1xreVhtDwwZEvbT5RyLbn rMayZgW/3OFJ4ZNfhLT6D9vlteSfz6YpVgMUG2uldmEy1lvqB11Z08eQvrZ3fNyJtDcs ZQVA== X-Gm-Message-State: AOAM53038+P2uHcZPnrEj6uDQgbGRBBXl2gc362YVzjTlNtz6+FAOUlF zCl1AIvsGahBpI61/x1inLiH+VhZXqCG7qqv X-Google-Smtp-Source: ABdhPJxI4SER/0TzrJzO6yfod5+AK6RQm16XhiTNOt4h3vjFt+0kuXGeV/0ZvqK3VSIGbNpZtHyNeA== X-Received: by 2002:a67:be0b:0:b0:32c:d82f:6723 with SMTP id x11-20020a67be0b000000b0032cd82f6723mr5825286vsq.67.1651602868262; Tue, 03 May 2022 11:34:28 -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 x19-20020ab035d3000000b003626f894df6sm3078916uat.36.2022.05.03.11.34.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 03 May 2022 11:34:28 -0700 (PDT) From: Philip McGrath Date: Tue, 3 May 2022 14:33:41 -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]: Add a 'symlink-src' phase to put license files where 'install-license-files' expects to find them. Supply '#:out-of-source? #t'. --- gnu/packages/racket.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index adf3ccfd74..2f4f7cebd8 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -272,8 +272,8 @@ (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 helps a lot with debugging + #:out-of-source? #t #:modules '((ice-9 match) (ice-9 regex) (guix build gnu-build-system) @@ -310,7 +310,15 @@ (define-public racket-vm-cgc #f))))))) (add-before 'configure 'chdir (lambda _ - (chdir "racket/src")))))) + (chdir "racket/src"))) + (add-after 'chdir 'symlink-src + ;; workaround for install-license-files + (lambda* (#:key out-of-source? #:allow-other-keys) + (when out-of-source? + (with-directory-excursion ".." + (symlink "src" + (package-name->name+version + (strip-store-file-name #$output)))))))))) (home-page "https://racket-lang.org") (synopsis "Old Racket implementation used for bootstrapping") (description "This variant of the Racket BC (``before Chez'' or