From patchwork Sun Feb 13 21:51:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37227 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 A61DA27BBE9; Sun, 13 Feb 2022 21:54:59 +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 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 6D25827BBE9 for ; Sun, 13 Feb 2022 21:54:59 +0000 (GMT) Received: from localhost ([::1]:56958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nJMpe-0005cb-Cz for patchwork@mira.cbaines.net; Sun, 13 Feb 2022 16:54:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nJMol-0005bs-I8 for guix-patches@gnu.org; Sun, 13 Feb 2022 16:54:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45181) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nJMol-0001tg-9G for guix-patches@gnu.org; Sun, 13 Feb 2022 16:54:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nJMol-0003Dt-91 for guix-patches@gnu.org; Sun, 13 Feb 2022 16:54:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH 03/11] gnu: chez-scheme: Use shared zlib and lz4. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Feb 2022 21:54: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: Liliana Marie Prikler , Philip McGrath Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164478918712208 (code B ref 53878); Sun, 13 Feb 2022 21:54:03 +0000 Received: (at 53878) by debbugs.gnu.org; 13 Feb 2022 21:53:07 +0000 Received: from localhost ([127.0.0.1]:39055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJMnq-0003Ak-Qa for submit@debbugs.gnu.org; Sun, 13 Feb 2022 16:53:07 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:38644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nJMnk-00039f-Ey for 53878@debbugs.gnu.org; Sun, 13 Feb 2022 16:53:00 -0500 Received: by mail-qt1-f176.google.com with SMTP id r14so14012645qtt.5 for <53878@debbugs.gnu.org>; Sun, 13 Feb 2022 13:53:00 -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=knl7LDfUD7f9wj7gODsWLpZQ7+iZL4ctHsMUkk99xXnZ5XJqCFbxn3Mmelx+XqB383 Y7fVpO3Dt6yY7FH492mfS95sqvd1YLYbR7YGSmDmqi7W4NZbtuRyod8V2bq767v+1mEC +h4aG7yBW4Q9MpULg2uZs4gKQ2ny3X5n4H1N0x2Il+h/dvms7zjZcPx+sEitbnwQGQF4 ZCJmR1RPeijb0fr6Zde4+2TMtrnbsWA48HwqIw7HhErimIy8sv+MKOIOXvW9dEZIb12z +qaa24hvU2c/4Hdfva2uQWaDQGdpGo0DG5CI0RYBxNUi4iRtug2nr9ahlIYJ9OngflvD crYg== 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=fOOLG8pmsN7CWDnBrMikJSOIcoYavyB/t/5OEGrOvN+tNlwOmfojEE93dVmZ93rCFR p6SMt7QCLKgZ1fUwar0244eoom+zvOk0CL8b43DasOPzUyoVzSH3DrFlZ3Ua28KMp72x EGXVFSsuV3A6W0IDST758296dntDQLWjdhMk4Lf838vhaRMFJvvriFHXeQDDtlC3UPZ5 dZzvXNCkSvYyNX1moKz0zZDmxB7wWIGfxN1i4rqJde0ZkK2u2CTQO05wPri7LTyF4Bxw 3OlSj87RYgs23BKfGuYDpBy7qu3l/+uyN/OnPKWSwQQ6QXh7zW2BNLA+NLSsofBZhDCn xfig== X-Gm-Message-State: AOAM5325BUP7KtbRQmbRaguwqQurf9LOd1KH80biAtZV8yHmu4GiMECg UkA3mbo5Jt7s/7auy3xSXFNJrF8Pyy9b3gcIS1k= X-Google-Smtp-Source: ABdhPJzH0A7gjSpVyoeO3q/Qbwvmf22OGZK11UeuY2NARSQva05aq2GVFemjS0fPwckgmtKrIMW13A== X-Received: by 2002:a05:622a:4cc:: with SMTP id q12mr7798291qtx.561.1644789174806; Sun, 13 Feb 2022 13:52:54 -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 p10sm15537738qtx.62.2022.02.13.13.52.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 13 Feb 2022 13:52:54 -0800 (PST) From: Philip McGrath Date: Sun, 13 Feb 2022 16:51:19 -0500 Message-Id: <20220213215127.218952-4-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220213215127.218952-1-philip@philipmcgrath.com> References: <20220213215127.218952-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: