From patchwork Tue Feb 8 15:18:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37094 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 CDABC27BBEA; Tue, 8 Feb 2022 17:27:13 +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,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 929D327BBE9 for ; Tue, 8 Feb 2022 17:27:13 +0000 (GMT) Received: from localhost ([::1]:33286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHUGm-0002Zt-NX for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 12:27:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHSIq-00063L-Vb for guix-patches@gnu.org; Tue, 08 Feb 2022 10:21:16 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54455) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHSIh-0008RX-Gn for guix-patches@gnu.org; Tue, 08 Feb 2022 10:21:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHSIh-0006sr-6E for guix-patches@gnu.org; Tue, 08 Feb 2022 10:21:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [RFC PATCH 3/9] gnu: chez-scheme: Use shared zlib and lz4. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 15:21:03 +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 Cc: Philip McGrath Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164433360626266 (code B ref 53878); Tue, 08 Feb 2022 15:21:03 +0000 Received: (at 53878) by debbugs.gnu.org; 8 Feb 2022 15:20:06 +0000 Received: from localhost ([127.0.0.1]:48331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHSHm-0006pU-5H for submit@debbugs.gnu.org; Tue, 08 Feb 2022 10:20:06 -0500 Received: from mail-qk1-f171.google.com ([209.85.222.171]:44682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHSHe-0006oO-L0 for 53878@debbugs.gnu.org; Tue, 08 Feb 2022 10:19:58 -0500 Received: by mail-qk1-f171.google.com with SMTP id c189so13888922qkg.11 for <53878@debbugs.gnu.org>; Tue, 08 Feb 2022 07:19:58 -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=NrUrTgUVsw38qpTKfIYl2vJbliIV3wXNuKimJY8k5Sc=; b=aRGBJskz6GUlOoCA8CwkCe52dVeXdj+e7d1RggRckseyF+6iLeFDD2Pq7Yw4Gigqo4 +yQaOqJRcLdicn+o8S6Tg1M5HG8D1ztsKn+gqB3N1h7++llrMG82uND16t/Fp3VqxnKW FZ6KFSGWpQDguJnFPgyteclXh/fBBhvexNISpcaKJFJkTAIa4VzlCilYXx2iV9Fc2dw+ IfZruM64F0wvbUsDTcBxh4ubgZhzNsmmGDINh9L5i54F9jRfnhfT1ZBvsP99qIlTJqys Nup/nZzkfrImUcX/Wk/05RtcOWe8ii4LAtapO8Y8QIN9JOS5vReOpTbf89L+oC/Bro/a 8NSQ== 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=NrUrTgUVsw38qpTKfIYl2vJbliIV3wXNuKimJY8k5Sc=; b=dIhU4pVrjmQVaouz1FsoGWkY1Cl0eesbIF5JXwz/Twg7wHCxC8v/p/jUfONzW4+BcD CDSFopsaaExugoL7PK21VtdZ/0GRdKOSRz+RGA/yFrBiL4Fw2GTG1lHFa1QdEpJSvyK6 N8bo1ot0ae+FtvQMXqI7yX51INNBT6AZhca7P4Ebbl4hIA7ru5buhhgwjuUTylxTXvln yrRN8FkP1OfeseEQ4wU4wm1DGysc5IIkhBhbE8CqpEwFhgtpAwbhRJsvPGVlkqT96wy7 hMI5UnW53h0IFrh/ioVetmtoEq80mDkMjmyPMnej3sh8k9ogSu8OcrHu4PeYfDYem2lK uDsA== X-Gm-Message-State: AOAM531DmLTARfzf8VcUQJ8DzKXMwsQuJPsfVy1zJIobAw4zvtDyo3E/ r5drN+NRsqWvIU8U2GM3Kzr0pyITl7AJypmM5KI= X-Google-Smtp-Source: ABdhPJytDorG4rsyAhLZJgnrhyo7FB9C0NDMMo31OS8EyjwWRJhkA8zpooqW99RbnTmBZyGR9cj0VA== X-Received: by 2002:a05:620a:7e7:: with SMTP id k7mr2905118qkk.268.1644333593128; Tue, 08 Feb 2022 07:19:53 -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 z4sm7798083qtw.4.2022.02.08.07.19.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Feb 2022 07:19:52 -0800 (PST) From: Philip McGrath Date: Tue, 8 Feb 2022 10:18:51 -0500 Message-Id: <20220208151857.1900389-3-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220208151857.1900389-1-philip@philipmcgrath.com> References: <20220208151316.1897345-1-philip@philipmcgrath.com> <20220208151857.1900389-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 This change also involves building 'libkernel.a' instead of 'kernel.o'. Support for these build options was merged upstream in 2019: see discussion at . * gnu/packages/chez-and-racket-bootstrap (chez-scheme)[inputs]: Remove 'zlib:static' and 'lz4:static'. [arguments]: Adjust configure phase accordingly. --- gnu/packages/chez-and-racket-bootstrap.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/packages/chez-and-racket-bootstrap.scm b/gnu/packages/chez-and-racket-bootstrap.scm index 1ed4631ced..11d570059b 100644 --- a/gnu/packages/chez-and-racket-bootstrap.scm +++ b/gnu/packages/chez-and-racket-bootstrap.scm @@ -114,9 +114,7 @@ (define-public chez-scheme (inputs `(("libuuid" ,util-linux "lib") ("zlib" ,zlib) - ("zlib:static" ,zlib "static") ("lz4" ,lz4) - ("lz4:static" ,lz4 "static") ;; for expeditor: ("ncurses" ,ncurses) ;; for X11 clipboard support in expeditor: @@ -169,14 +167,14 @@ (define src (lz4-static (assoc-ref inputs "lz4:static")) (out (assoc-ref outputs "out")) ;; add flags which are always required: - (flags (cons* - (string-append "--installprefix=" out) - (string-append "ZLIB=" zlib-static "/lib/libz.a") - (string-append "LZ4=" lz4-static "/lib/liblz4.a") - ;; Guix will do compress man pages, - ;; and letting Chez try causes an error - "--nogzip-man-pages" - configure-flags))) + (flags (cons* (string-append "--installprefix=" out) + "ZLIB=-lz" + "LZ4=-llz4" + "--libkernel" + ;; Guix will do compress-man-pages, + ;; and letting Chez try causes an error + "--nogzip-man-pages" + configure-flags))) (format #t "configure flags: ~s~%" flags) ;; Some makefiles (for tests) don't seem to propagate CC ;; properly, so we take it out of their hands: