From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WLvGIGfkGmKQVwEAgWs5BA (envelope-from ) for ; Sun, 27 Feb 2022 03:39:35 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id WEYqHmfkGmKUVwAA9RJhRA (envelope-from ) for ; Sun, 27 Feb 2022 03:39:35 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1D90D35A00 for ; Sun, 27 Feb 2022 03:39:35 +0100 (CET) Received: from localhost ([::1]:40108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nO9TC-0007Pp-7Z for larch@yhetil.org; Sat, 26 Feb 2022 21:39:34 -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=A8s?= , 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1645929575; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=c6TzP7tP4BB13MBcjLiq0wzXqF2mXc5qBVWu9Pd9w4o=; b=kAyxL8/+Hs4hUCwfUbGmHJSgcUvUiWUyH08Z7YdpuAhLP3W+UXH2GdYMPrpx6R/kvq5s4P kH6encK4Sm1Z1X/+Z2ulHM8x4EsNtoUm8aafue0EocNB5nej7lvSBk9xVYdrtNvcE7oZ8W 5/iM56xAk5WbrAlSftVWgr39B/uO82Pt0jCsWqjOyHB3zSGsnkTbU3c9TiSx0FjiWn8mYr c/0rIZTo1LDbeD72uNvBBFERfvKQQfi4OAxYkZ7VjmA6tf9mBz86VcYhquk+LV9465agDd QGk4AjGdZNvg7heCf4Eu/NNEP9RV+kPONgI+ndcAvobjNB2zo6XSK6VdJfOCWQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645929575; a=rsa-sha256; cv=none; b=QZ60d/QpjbJeuvTiryGJ7gPzKrO2uUQ6A+wODjpjNVECvqcHfqZnIQFzFJd13IEAOMxGGe 2HSzT5oROe2D4m+OaKmaZHc6c946Dxxy2Pds6h4KPeSnNyUM2kJ+cWY4LKR4a4Al5CkDkG LlyG4MdJEDSl6hYpgVbGHIMTtEXc57LtoQa7zJZf1hHEPxHdRDtgOD1LNGwHkDufhJ968u YcfqlRdwmQTbq9PPuAZem8vaT4MMHVVagQRQtOMmvzxVszMuMGMlAHgekVWYwV9FZWgH+b RTOxpVe6W4DolGf+JLxyhiOHeV5OYV1dY35+YjK4/SnTz450vRXiBLqHqpGAnQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=L39zSGW8; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 3.89 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=L39zSGW8; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 1D90D35A00 X-Spam-Score: 3.89 X-Migadu-Scanner: scn0.migadu.com X-TUID: k6we/mfxYtkt 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/" -- 2.32.0