From patchwork Sun Feb 27 21:29:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37543 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 7542927BBE9; Sun, 27 Feb 2022 21:32:44 +0000 (GMT) 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_H5,RCVD_IN_MSPIKE_WL, 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 CD56127BBEA for ; Sun, 27 Feb 2022 21:32:43 +0000 (GMT) Received: from localhost ([::1]:60318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOR9n-0001Hu-0H for patchwork@mira.cbaines.net; Sun, 27 Feb 2022 16:32:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOR9B-0000YD-GE for guix-patches@gnu.org; Sun, 27 Feb 2022 16:32:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37247) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOR9B-0005fP-6B for guix-patches@gnu.org; Sun, 27 Feb 2022 16:32:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nOR9B-0008I8-3K for guix-patches@gnu.org; Sun, 27 Feb 2022 16:32:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v7 15/24] gnu: chez-scheme: Use "lib/chez-scheme" for search path. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 21:32:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53878 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53878@debbugs.gnu.org, Liliana Marie Prikler , zimoun Cc: Philip McGrath , Ludovic =?utf-8?q?Court=C3=A8?= =?utf-8?q?s?= , Maxime Devos , raingloom , Liliana Marie Prikler , Attila Lendvai , Malte Gerdes Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164599751731804 (code B ref 53878); Sun, 27 Feb 2022 21:32:05 +0000 Received: (at 53878) by debbugs.gnu.org; 27 Feb 2022 21:31:57 +0000 Received: from localhost ([127.0.0.1]:59369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOR93-0008Gt-Hw for submit@debbugs.gnu.org; Sun, 27 Feb 2022 16:31:57 -0500 Received: from mail-qk1-f178.google.com ([209.85.222.178]:36388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOR8p-0008GD-K5 for 53878@debbugs.gnu.org; Sun, 27 Feb 2022 16:31:44 -0500 Received: by mail-qk1-f178.google.com with SMTP id g24so9008093qkl.3 for <53878@debbugs.gnu.org>; Sun, 27 Feb 2022 13:31:43 -0800 (PST) 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=c6TzP7tP4BB13MBcjLiq0wzXqF2mXc5qBVWu9Pd9w4o=; b=Jz0jdKoEbGrUhpw14HKNTYAeAtljTdq6GXAU6+RERIyIzSCXbp113frdKD20IfhFPG 1CbtBgYxg3fu6B0nMiMrja/kFbZXtoDsfAJekYENPCTWCLL9BA68psFAmd0jFY5iQx/Q iBlFY/mDuIg30J1J8z+1Y7wPsZ/2arBsSz2WtyJCHEP9gZXWN4gUbLW1YqTW+EfZ9Zin 5MwOQBKmakTaDPk43E8dRa5YZQVaLfLoJNsc0V5oGhuUrho73MVz+hiNYw/ZJQ4n+fYY pvb7zA01LSwZnfTL1Tme7pKju57Ovk6c92Kji1kxgAQN4ZuR7+bcLgsV9vLlbkI0V+Gz jw6Q== 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=c6TzP7tP4BB13MBcjLiq0wzXqF2mXc5qBVWu9Pd9w4o=; b=wKRhH5s6kgluMdIpmu4TQX/ZMAFfccRFI1opjsEqIHGcqtdglVWUKo7THIQ29yaCC/ 68WY13cvtsiuEuI4Ep/NZsjLwX99K7tbVMaeSAvj+AcYRo9jVdUndih18frNyRrr3b/+ AyX7GMPKeDyqt+ze/EsUY23Bjt408wOEpqodT07Nt7oApYtl/pjqrA5V0AJnDpd67e8N Jk+hd+WAdHriZ/rXjrXB7aTKWuvEGSu3SY4BxRVPjXNNAILzhZT9car6T4Gt5jOdtWUL FL1Y1+r7nv4uN/McABlBAb4Xi0fqKCnrxVX24H7ryf/Gh7Qa3EeBvKnqpyZyfrbDsxfF Jnzg== X-Gm-Message-State: AOAM531MCmHDGVi+kFLLHymWEU1qZlJYwuBEueBANQu6FlZrWkBU7Xgh uTUoYWsRqed0ZzeTcM8S2BQRhLtWFy/DRVEAuwg= X-Google-Smtp-Source: ABdhPJxpUXGbxjZWYcoDRskZr35jvEHGN0XpwvzPTyYl0+6cU27KydJomXmAJmnNt6zr/J2Ln1nUWA== X-Received: by 2002:a05:620a:ecb:b0:646:d52f:6424 with SMTP id x11-20020a05620a0ecb00b00646d52f6424mr9935320qkm.375.1645997498019; Sun, 27 Feb 2022 13:31:38 -0800 (PST) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id k10-20020ac85fca000000b002dce6b890casm5601067qta.40.2022.02.27.13.31.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 27 Feb 2022 13:31:37 -0800 (PST) From: Philip McGrath Date: Sun, 27 Feb 2022 16:29:11 -0500 Message-Id: <20220227212920.2009000-16-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220227212920.2009000-1-philip@philipmcgrath.com> References: <20220220060610.178131-1-philip@philipmcgrath.com> <20220227212920.2009000-1-philip@philipmcgrath.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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches There does not seem to be any widely accepted standard path to use for "CHEZSCHEMELIBDIRS". Using a path without a version number in it avoids having to compute the actual path everywhere, which would be especially unpleasant when support is added for the Racket variant of Chez Scheme, which always has a different version number than upstream. * gnu/packages/chez.scm (chez-scheme)[native-search-paths]: Change to use "lib/chez-scheme" instead of "lib/csvX.Y.Z-site" for "CHEZSCHEMELIBDIRS". (chez-make-flags): Update accordingly. (chez-sockets)[arguments]<#:phases>: Likewise. --- gnu/packages/chez.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 4ee9711bb4..f4c87fbcf7 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -233,7 +233,7 @@ (define-public chez-scheme (native-search-paths (list (search-path-specification (variable "CHEZSCHEMELIBDIRS") - (files (list (string-append "lib/csv" version "-site")))))) + (files '("lib/chez-scheme"))))) (outputs '("out" "doc")) (arguments `(#:modules @@ -458,9 +458,9 @@ (define chez-configure (define (chez-make-flags name version) #~(let ((out #$output)) (list - ;; Set 'chezversion' so that libraries are installed in - ;; 'lib/csvX.Y.Z-site' like Chez's 'native-search-paths' expects. - (string-append "chezversion=" #$(package-version chez-scheme)) + ;; Set 'schemedir' so that libraries are installed in + ;; 'lib/chez-scheme' like Chez's 'native-search-paths' expects. + (string-append "schemedir=" out "/lib/chez-scheme") (string-append "PREFIX=" out) (string-append "DOCDIR=" out "/share/doc/" #$name "-" #$version)))) @@ -608,9 +608,7 @@ (define-public chez-sockets (replace 'build (lambda args (let ((chez-site (string-append #$output - "/lib/csv" - (package-version chez-scheme) - "-site/arcfide"))) + "/lib/chez-scheme/arcfide"))) ;; make sure Chez Scheme can find the shared libraries. (substitute* "sockets.ss" (("(object \")(socket-ffi-values\\.[sd][oy][^\"]*)(\")" @@ -634,9 +632,7 @@ (define-public chez-sockets (lambda args (install-file "sockets.so" (string-append #$output - "/lib/csv" - #$(package-version chez-scheme) - "-site/arcfide")) + "/lib/chez-scheme/arcfide")) (install-file "sockets.pdf" (string-append #$output "/share/doc/"