From patchwork Sun Feb 20 06:05:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37362 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 9CB3D27BBEC; Sun, 20 Feb 2022 06:08:01 +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 E435527BBEA for ; Sun, 20 Feb 2022 06:08:00 +0000 (GMT) Received: from localhost ([::1]:58206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nLfO4-0005Jc-2t for patchwork@mira.cbaines.net; Sun, 20 Feb 2022 01:08:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nLfNA-0005I2-7s for guix-patches@gnu.org; Sun, 20 Feb 2022 01:07:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nLfN9-0003ze-SS for guix-patches@gnu.org; Sun, 20 Feb 2022 01:07:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nLfN9-0005Ng-OL; Sun, 20 Feb 2022 01:07:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v4 03/15] gnu: chez-scheme: Use shared zlib and lz4. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, guix-patches@gnu.org Resent-Date: Sun, 20 Feb 2022 06:07: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, Liliana Marie Prikler , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Cc: Attila Lendvai , Malte Gerdes , raingloom , zimoun , Philip McGrath X-Debbugs-Original-Xcc: Philip McGrath Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164533720420551 (code B ref 53878); Sun, 20 Feb 2022 06:07:03 +0000 Received: (at 53878) by debbugs.gnu.org; 20 Feb 2022 06:06:44 +0000 Received: from localhost ([127.0.0.1]:59163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLfMq-0005LN-B2 for submit@debbugs.gnu.org; Sun, 20 Feb 2022 01:06:44 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:35505) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLfMc-0005KD-SI for 53878@debbugs.gnu.org; Sun, 20 Feb 2022 01:06:39 -0500 Received: by mail-qv1-f51.google.com with SMTP id d7so23847551qvk.2 for <53878@debbugs.gnu.org>; Sat, 19 Feb 2022 22:06:30 -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=Hw1OnwiBYX9gMLhU6AamneOJruopTEhBVESgXrnejdpaWaRY+BHSBJrfKgSchkjEF3 LOsc7uAdmh65saFYH0mhnW1D7s9oCniAKL3IU2iqtCApSoy5eqds9C6fK9f+G9CZakZ6 eHBhJWZh6mRVezn/dheA2rCnKXj5epknE8GTPgTQkYlMFG2ouotfD9uYB4T5Jx/UtqrG dgKor2Vsh/MnmLLL0gibR2Lq2ZJxDhLJTQ7C5u6CV27DczH3jaF367OYQW4IcRX+aHs+ WXucYlFnlKpRAAp9yvtMEBaEjCa177Uz+dLjCv1O+XNJwF2/etgq7egTo9e3v5uEw8WF ONQQ== 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=SMF5TJaW3bC9ZYoBW0qOU62prRB9cClH21ekSxf9g66KPvuvsu4jE3u1lxnzjfhcoJ /mQL3gRSLFna8yf7cYRq9SeBrDsWp1y9u46EyVFeU9oirMFDwv2V71SgEkG9g8R3oTU1 /HadxeYr0rULHGKztUiHSze8JdzS/X8X+ryAt9MMOo2hqOBOqlKP/7aXbXX5vjHkTcYq HmYsfFo51jnTejm5q4qQClSSCBo4rkzwDYP6QaOtBoWansObS0KwqZaync+/70YMj17E CZMUeZ+DT/76TlOKc7FAqHbDRRvt7tzJwmil0IL6aYRbmFKAe4gegNQvVmZbHW9S0r6Z ngpA== X-Gm-Message-State: AOAM533MQWCTDEMZpUV/UCRVOgrM90TeIL5BwbCOT0r4Dbdkzx6LhJ+Y 6Qf3u0QeQsqZzVp4hWcIIKVmxyg+LZ0uFnq1Png= X-Google-Smtp-Source: ABdhPJzmpQRQnt3zqpqHA4S4ToLyHvi0k6g7eRJpG7rXzNveDV1tGt7Ef4KdMNAF/Sc/VdLYnyeCXQ== X-Received: by 2002:ac8:5f4a:0:b0:2dd:1ec1:7bea with SMTP id y10-20020ac85f4a000000b002dd1ec17beamr12939173qta.205.1645337185358; Sat, 19 Feb 2022 22:06:25 -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 x12sm553340qtw.9.2022.02.19.22.06.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 19 Feb 2022 22:06:25 -0800 (PST) From: Philip McGrath Date: Sun, 20 Feb 2022 01:05:58 -0500 Message-Id: <20220220060610.178131-4-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220220060610.178131-1-philip@philipmcgrath.com> References: <20220208151316.1897345-1-philip@philipmcgrath.com> <20220220060610.178131-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: