From patchwork Sun Feb 27 02:34: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: 37499 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 01A8927BBEC; Sun, 27 Feb 2022 02:39:35 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_FMBLA_NEWDOM,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 4588C27BBEA for ; Sun, 27 Feb 2022 02:39:34 +0000 (GMT) Received: from localhost ([::1]:40108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nO9TB-0007Pp-E6 for patchwork@mira.cbaines.net; Sat, 26 Feb 2022 21:39:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nO9Sj-0006qc-SI for guix-patches@gnu.org; Sat, 26 Feb 2022 21:39:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34468) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nO9Sj-0006Ue-Jo for guix-patches@gnu.org; Sat, 26 Feb 2022 21:39:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nO9Sj-0004JF-GR for guix-patches@gnu.org; Sat, 26 Feb 2022 21:39:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v6 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 02:39: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.164592951316404 (code B ref 53878); Sun, 27 Feb 2022 02:39:05 +0000 Received: (at 53878) by debbugs.gnu.org; 27 Feb 2022 02:38:33 +0000 Received: from localhost ([127.0.0.1]:56572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nO9SD-0004GQ-HK for submit@debbugs.gnu.org; Sat, 26 Feb 2022 21:38:33 -0500 Received: from mail-qt1-f172.google.com ([209.85.160.172]:41478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nO9S7-0004Ft-Vy for 53878@debbugs.gnu.org; Sat, 26 Feb 2022 21:38:28 -0500 Received: by mail-qt1-f172.google.com with SMTP id n11so6102496qtk.8 for <53878@debbugs.gnu.org>; Sat, 26 Feb 2022 18:38:27 -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=L39zSGW8EhA6rWq2LEN+LXb1A9Cbws9UUTf5FyZqUEaJGdU3Mg66EbCOmNW/gGNVIN yWWENPzw47Hqot280+ClIjxZ6DMLHLDZFEhLVT34iMO6ol7ZyGD49iEeMB5u5HsE9EZf qeGDGfW0d0z/Y9ta0M993N3v1Sjs35XNuuO3TJxzgQUbCGb21QNEbOI+jfavHDzzRx0y ABrbZONlxVODRjbdHHANpla0v5xd32z2uJUXUI7LKTWNP8h8+ianoOEqdcOHQoj+at1R 6kwtJRrfw6hyKpdgQs+c0QqXkmH+mSvTcPgq4rWw08RnMlnHCR1vMmVdUma/EYwj7rA1 94mg== 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=1xGPNXyRXL/jqN/Zw23MDpbDScnYbrGboYwL57cRo/zzSDXLYTLJ6DruKfVWAIDh6m f7f+CKqlMAAr/8CJGdGI7xJhTxyjyxk9TF82Epclb3YLHGT3j+5T+xTWNeVLLXoeByGP j4bVQsew2aSJ0BmqZMrm1838TwaZT2aEFPVGTrOGPIjg8WwvGQYkMfduFSjOpk4CtbhM FLvjwIkqPByBJzI595e4EBTjwSq8Z1XWtWq1E4bPNBNZFR1fQ7X2d+Lq4zrZrB9p2Gil QoAPkv+1wSWZkIgT518PvKjopSsrPfk650ZDhoqQJTKI4PMJ+T/GXLNdEo8YKidz1U5K KNVw== X-Gm-Message-State: AOAM530phasT0U2OmV1lp68KJ4hOgLld2ubKlFpGBeFGbBt+BypyLtJE +QUZDJwoPM70oZReLtj6/uM1iSWTg715ftVzXVM= X-Google-Smtp-Source: ABdhPJz9MIOHdq5uUkgxTvyYO3unCN4gRgifv4VaWXXwB73GObKF4MmC/pw9cgm3RzefrIUQSsSv9w== X-Received: by 2002:a05:622a:590:b0:2de:93aa:4ff1 with SMTP id c16-20020a05622a059000b002de93aa4ff1mr12271190qtb.204.1645929502469; Sat, 26 Feb 2022 18:38:22 -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-20020a05622a03ca00b002de9f8e660dsm4432519qtx.63.2022.02.26.18.38.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 26 Feb 2022 18:38:22 -0800 (PST) From: Philip McGrath Date: Sat, 26 Feb 2022 21:34:41 -0500 Message-Id: <20220227023450.1877215-16-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220227023450.1877215-1-philip@philipmcgrath.com> References: <20220220060610.178131-1-philip@philipmcgrath.com> <20220227023450.1877215-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/"