From patchwork Sun Feb 27 02:34:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37502 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 9CFDD27BBEA; Sun, 27 Feb 2022 02:39:44 +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,FROM_FMBLA_NEWDOM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,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 36CEA27BBE9 for ; Sun, 27 Feb 2022 02:39:44 +0000 (GMT) Received: from localhost ([::1]:40760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nO9TL-0007rL-C5 for patchwork@mira.cbaines.net; Sat, 26 Feb 2022 21:39:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nO9Sk-0006uv-Ug for guix-patches@gnu.org; Sat, 26 Feb 2022 21:39:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34470) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nO9Sk-0006VE-K5 for guix-patches@gnu.org; Sat, 26 Feb 2022 21:39:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nO9Sk-0004JW-GM for guix-patches@gnu.org; Sat, 26 Feb 2022 21:39:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v6 16/24] 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, 27 Feb 2022 02:39:06 +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=A8?= =?utf-8?q?s?= , Maxime Devos , raingloom , Liliana Marie Prikler , Attila Lendvai , Malte Gerdes Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164592951516421 (code B ref 53878); Sun, 27 Feb 2022 02:39:06 +0000 Received: (at 53878) by debbugs.gnu.org; 27 Feb 2022 02:38:35 +0000 Received: from localhost ([127.0.0.1]:56576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nO9SE-0004Gg-S8 for submit@debbugs.gnu.org; Sat, 26 Feb 2022 21:38:35 -0500 Received: from mail-qv1-f47.google.com ([209.85.219.47]:38677) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nO9SC-0004Fy-8x for 53878@debbugs.gnu.org; Sat, 26 Feb 2022 21:38:32 -0500 Received: by mail-qv1-f47.google.com with SMTP id d3so9829618qvb.5 for <53878@debbugs.gnu.org>; Sat, 26 Feb 2022 18:38:32 -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=vYcCJ8OzcVN6l+LnkyuEvkLv2msDMJdHSBe1qqljWPg=; b=XQCjvPvirqd/oUHhiyA0IWoaCR3fk5J6N66ZziIW4Zfr+NpLVp//RO5VMoAhrOw3lR TRw5rb4lp1bYXcv1gOvW7CG1TX2Uu1iAIYcVCuMCCFGs7emibdUxVEfCSHdRMjR1SKZ0 vgxmC/r/q6vvF1iPLNQ+JFMHuELc1J22nT53fsw9KAvKKNxpLSeGkJFVT3SmX5HNfaXd h+jkFpEJGd7w9F8ZtdmlZ51tWa4/zIPk6Hz5qyff94ICyeUQNstFjxHCKhS1gwoJ1as7 VrWO9Y/qOe4Yt5f8ZUdpQrciYGYebVVV5XEwlEzpEq2E6F/60cxWZ23KHDzILP7vY+td mcHQ== 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=vYcCJ8OzcVN6l+LnkyuEvkLv2msDMJdHSBe1qqljWPg=; b=spXYI4D6dRpLUh1eSOk+fkioYAZ8nE9XiDfLkD2BOzPG+6xAcp5syToxnPlxw1C/lv p39jJNAzkzZqgBdQkdKld7EswmJgEx/NdGCQgCXjWyZeWjpm9uEDveli0aJhtakBUDBO 0GAY4tDT8tgjgromrVveagFCYwT/ESQHS+03CrKlUrYFBxm3ywvdvizl4+Qieb10bbJc ta3Iu+3VVN5XLHYq5WJsMnv9m5jQrsBxfCZhgj1//gdt+Q0rrTOpHZDCyGxlrHPF3PLZ BAhPzMFWsd51P9kcErasqhOSoC0JAfmkVGgfHnSpgQHro5CfqeQ87r97xKkDGWJSJ1xf iOsw== X-Gm-Message-State: AOAM530ovIlKLkWbSkzr1v4nDHYSiPYrCYsIz9tgCXFXTwTMZu9XxAH6 wmOiwvEYknSftkr6DRUzWvIaSpiC1UVkrNG8bO8= X-Google-Smtp-Source: ABdhPJw6/OyAh9w/wDundD32JCd4mEvQqAqBjTXAf0o/9PuH0Mw1rB9rTl6+1gb3oKGVANywsGP7OQ== X-Received: by 2002:a0c:ab84:0:b0:432:916b:abb9 with SMTP id j4-20020a0cab84000000b00432916babb9mr10266671qvb.33.1645929506752; Sat, 26 Feb 2022 18:38:26 -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 x26-20020ae9f81a000000b005f1916fc61fsm3181897qkh.106.2022.02.26.18.38.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 26 Feb 2022 18:38:26 -0800 (PST) From: Philip McGrath Date: Sat, 26 Feb 2022 21:34:42 -0500 Message-Id: <20220227023450.1877215-17-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 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.scm (chez-scheme)[inputs]: Remove 'zlib:static' and 'lz4:static'. [arguments]: Adjust configure phase accordingly. --- gnu/packages/chez.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index f4c87fbcf7..dd40baa719 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -211,9 +211,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: @@ -266,14 +264,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: