From patchwork Sun May 8 20:07:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 39160 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 AAA2527BBE9; Sun, 8 May 2022 21:29:35 +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 8A17727BBEA for ; Sun, 8 May 2022 21:29:32 +0100 (BST) Received: from localhost ([::1]:60072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnnX1-000294-MH for patchwork@mira.cbaines.net; Sun, 08 May 2022 16:29:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnnEB-0003kf-68 for guix-patches@gnu.org; Sun, 08 May 2022 16:10:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnnEA-0008Ux-Rt for guix-patches@gnu.org; Sun, 08 May 2022 16:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnnEA-0002N2-Mn for guix-patches@gnu.org; Sun, 08 May 2022 16:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55248] [PATCH v2 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: Sun, 08 May 2022 20:10: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.16520405688969 (code B ref 55248); Sun, 08 May 2022 20:10:02 +0000 Received: (at 55248) by debbugs.gnu.org; 8 May 2022 20:09:28 +0000 Received: from localhost ([127.0.0.1]:55260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnnDc-0002Ka-Hz for submit@debbugs.gnu.org; Sun, 08 May 2022 16:09:28 -0400 Received: from mail-vs1-f48.google.com ([209.85.217.48]:43914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnnDb-0002KJ-9X for 55248@debbugs.gnu.org; Sun, 08 May 2022 16:09:27 -0400 Received: by mail-vs1-f48.google.com with SMTP id c62so12041023vsc.10 for <55248@debbugs.gnu.org>; Sun, 08 May 2022 13:09:27 -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=HkK+ErOS2hA7+W84RIfwwEGLDOSu3AHQYO0mtAnYsOw=; b=OSLq9rjcnWN3No1jyrrX06BxUkeJsmM01QTVOsib21PT/GscKj6yfQmvOy0JBeXw9K /ok5tnCKpeOCQbFEx6xmcWDz+FobsWMngFNIjoKze/VgTnoY0ZcJ+FgdM3DN4R4vX/Jo 3LmSVV4SHqjS7ScHaDgjtwxvymiqVU5T4kA0+f5j0Tnmhjl7H5lq5oONQz+9dIdUeLoz rnauWdGgXCnTxlzz4/zKkC8HPVjlgRcWjm/SsaZEKqwm+kYNwUmCUOxLuVh7swIqw3+G ODd2sWOuj+5yfRo/sDbSlX+iNa5HT4mSyqGP+6nhpLMgYSwCa6w9FfIlFlr8/zJLaTAW aB9w== 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=HkK+ErOS2hA7+W84RIfwwEGLDOSu3AHQYO0mtAnYsOw=; b=PJ83exdbVkP/eMVJiXwF5afKDnKfmQTeUYpgTuPtyvNszZEAOVmllZhBzG7OZGwp9q KB/3Okr1TsIhjWxhWKkp8GKGgetzcMg1b6e+WV70VRzEp3NacNnphqtAaswR8uiqGN/0 sa4i7WcP4VxvT/UBjqGY3POCVjZzdSZImnTmAg29MpTECqSj5ZhE8WkCt77GlEQ4mW3g SGDTVkpnMwqfZg3A3OnPrXKYKIzH3Qx32EPTlLuyqSazc3R3CGfCTK66rMIHecoAJYre OoWi2kuJxHSKr9lEuvSg/zXe5oFrmmbIKUJ5DME7DIsZnvkBEHJj8nso9FnqVmHr1Y8D htuA== X-Gm-Message-State: AOAM530y7C2AJHpEgb0uthCDAzLgN7ft0w/3RUVrzIVilkpKKdxPCpkM l4HcBAOQ2yNFvtDd4IKlnBYZ/DiMkvuwrfPu X-Google-Smtp-Source: ABdhPJwbqPbFDXjKkK530pa4cvsbRMoydIHpMf8CH6VSG/XbThY93K6JyXIqtk8j9/xT33z0o1T8hA== X-Received: by 2002:a67:e197:0:b0:32d:fbb:b0b2 with SMTP id e23-20020a67e197000000b0032d0fbbb0b2mr6649430vsl.84.1652040561830; Sun, 08 May 2022 13:09:21 -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 k5-20020ab07545000000b003626f894de7sm1357282uaq.21.2022.05.08.13.09.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 May 2022 13:09:21 -0700 (PDT) From: Philip McGrath Date: Sun, 8 May 2022 16:07:45 -0400 Message-Id: <63d9ad60e39d8315f493b0ca49517f21fb320575.1652039837.git.philip@philipmcgrath.com> 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 phase 'symlink-license-src' to work around limitation in 'install-license-files'. Supply '#:out-of-source? #t'. --- 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..904dfe9bef 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"))) + (add-after 'chdir 'symlink-license-src + ;; Work around limitation of install-license-files by symlinking + ;; srcdir where it expects. (It doesn't handle this variant of + ;; #:out-of-source? and a subdirectory for srcdir.) Just running + ;; `make install` only puts them in Racket's 'share-dir'. + (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