From patchwork Sat Feb 19 06:42:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37341 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 32D8F27BBEA; Sat, 19 Feb 2022 06:46:23 +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 BCAB727BBE9 for ; Sat, 19 Feb 2022 06:46:22 +0000 (GMT) Received: from localhost ([::1]:39748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nLJVd-0007Ru-S9 for patchwork@mira.cbaines.net; Sat, 19 Feb 2022 01:46:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nLJTQ-0006yY-4A for guix-patches@gnu.org; Sat, 19 Feb 2022 01:44:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nLJTP-000812-4x for guix-patches@gnu.org; Sat, 19 Feb 2022 01:44:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nLJTP-0004mf-3O for guix-patches@gnu.org; Sat, 19 Feb 2022 01:44:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v3 03/15] gnu: chez-scheme: Use shared zlib and lz4. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Feb 2022 06:44: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 Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Attila Lendvai , Philip McGrath , Malte Gerdes , zimoun Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164525300018188 (code B ref 53878); Sat, 19 Feb 2022 06:44:03 +0000 Received: (at 53878) by debbugs.gnu.org; 19 Feb 2022 06:43:20 +0000 Received: from localhost ([127.0.0.1]:56718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLJSh-0004jH-Ir for submit@debbugs.gnu.org; Sat, 19 Feb 2022 01:43:19 -0500 Received: from mail-qk1-f178.google.com ([209.85.222.178]:40689) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLJSd-0004ii-PZ for 53878@debbugs.gnu.org; Sat, 19 Feb 2022 01:43:17 -0500 Received: by mail-qk1-f178.google.com with SMTP id c7so8001049qka.7 for <53878@debbugs.gnu.org>; Fri, 18 Feb 2022 22:43:15 -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=gDSW1Pp3CBqzEkE2cZVrNJcJKDZ0I2YL2BinTbUPTtCTig85TXZkg6j0uLct/Gh/xL /YxesmYca/d+TsRIGe4KHqIkrh0Frk3wxeKLZeEqyL8M92RBDwfi6cb4a7pZQzAzHzfc QDhpxoGqUYha5RNl1o3t+q9aDE10UINB6vkfjKqaHPwDLpF8b4LiVfYts+kYW03osiAC xmpt19FwDy6wCfJuoAHBaeZsweeZWozGe27tbhnnXekNubfZ2LvwrP2HYJfHpxR/ioKS 0XSsLNwOaLMEvQr6qkboKZm5+3cKgF67ZlnxHR8rlt4i0P+LWCLfuHFBusiQmLo5CZRI O4GQ== 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=AQ1M0eNBYNND62bp0tUbYIwbRj9nHR8YzWwkg8x5N9gNeAnSwjFZ1Bj1kV2u+l64zk 2i5dBNpOhLdKLeg6T53pTR/IHr1MjHvlShh2kCdNynnUqM5L7qpiS4tVrPUtTyRjU8FN MSRyHdAQCw+khmf9ru//CwuOhK3p+dfjE8Y1ZdkZXAtOPmoteCNaw3HeJZN+/MX9VEAm sf2myrwfN7ov65Kaf00V2yNtFsRsrcgVDB3Y7s3F8jz25GYMzY587nphfaaR0vrL8JXI Cje7+p8+1Th/LnDjM2rqU/W8mS9agDaroozF4ks6JQ5Zmz6b49ZXXl6KnuuUSlNFCruF zDLw== X-Gm-Message-State: AOAM530X35SLd3pJFbj7rXO3jK+F/KCTuAUdXs88Zh/W6KL+Ut0TZ+tw uCPOwChWzpawN5on6C8MeKf/fdKsx7qaNrEiij4= X-Google-Smtp-Source: ABdhPJzUY/AqncNKqq3BS5zW5jYPdSAZhUbbbxmt5VBOKBfXcoPFeJ+88M4k2yfpCtFbbYtg1YUf1g== X-Received: by 2002:a37:bc45:0:b0:47e:292:4b8d with SMTP id m66-20020a37bc45000000b0047e02924b8dmr6797070qkf.484.1645252990143; Fri, 18 Feb 2022 22:43:10 -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 i4sm24884088qkn.13.2022.02.18.22.43.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 18 Feb 2022 22:43:09 -0800 (PST) From: Philip McGrath Date: Sat, 19 Feb 2022 01:42:16 -0500 Message-Id: <20220219064228.246917-4-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220219064228.246917-1-philip@philipmcgrath.com> References: <20220208151316.1897345-1-philip@philipmcgrath.com> <20220219064228.246917-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: