From patchwork Sat Feb 26 13:02:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37469 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 2513127BBEA; Sat, 26 Feb 2022 13:05:38 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 AF29D27BBE9 for ; Sat, 26 Feb 2022 13:05:37 +0000 (GMT) Received: from localhost ([::1]:53020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNwlU-0000Er-RE for patchwork@mira.cbaines.net; Sat, 26 Feb 2022 08:05:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNwkx-0000DC-1H for guix-patches@gnu.org; Sat, 26 Feb 2022 08:05:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60613) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNwkw-0003Rg-ND for guix-patches@gnu.org; Sat, 26 Feb 2022 08:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nNwkw-0005c0-HA; Sat, 26 Feb 2022 08:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v5 14/22] 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: Sat, 26 Feb 2022 13:05:02 +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: Ludovic =?utf-8?q?Court=C3=A8s?= , Maxime Devos , Attila Lendvai , Malte Gerdes , raingloom , philip@philipmcgrath.com X-Debbugs-Original-Xcc: philip@philipmcgrath.com Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164588068121481 (code B ref 53878); Sat, 26 Feb 2022 13:05:02 +0000 Received: (at 53878) by debbugs.gnu.org; 26 Feb 2022 13:04:41 +0000 Received: from localhost ([127.0.0.1]:54493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNwkb-0005aO-Gt for submit@debbugs.gnu.org; Sat, 26 Feb 2022 08:04:41 -0500 Received: from mail-qk1-f180.google.com ([209.85.222.180]:41514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNwjw-0005Vl-QO for 53878@debbugs.gnu.org; Sat, 26 Feb 2022 08:04:01 -0500 Received: by mail-qk1-f180.google.com with SMTP id d84so6786419qke.8 for <53878@debbugs.gnu.org>; Sat, 26 Feb 2022 05:04: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=cMhM4Hgg9U6jTMLRrhG0O3LswFRxbkC1hIDPaNTSRQc=; b=M7sGxU0O/9IWP7S1vnTpUoUNrI6tF/graDvi0wgapsezGE5rG7z54Qm92Rg9mCbPmC j38kOTM6Map509+Pc/Tk2BVtcUlP+B5Fr6D7LqAglM6Trz0yHA4Ypm8/dZ1W9RQHXkrH kfFTF7mGKU4BLCjjH3hqRz3xwn0asiCb32mEadBEw9sYf7DfeC5CFTyISryXrS+UjNbO C/UQDvhsIdD+0v8G/FjFua/AfC+FnTZQxgR5n/FWCDtLJSpYUcMtCKrAsZ+RM6SLw7cy 3mU4epZFGCfnEwcXOhDZD4M4ElnuNJKZyeh1PW/dds7SCRiI9mQc/bNT2x4ftECGrLCc gTmA== 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=cMhM4Hgg9U6jTMLRrhG0O3LswFRxbkC1hIDPaNTSRQc=; b=6an9o/z1BvaB4+YjDXJDjdj5Yj4VSHzwgSl9mwVxacbFwXSAEGF6FlIlCIzb4+/RXV lZPKOYl2AQhvlqbGYvZaDuCkMkRgPSUkuUbk+tJkkAj/klmkFRuCm/yd1fWh5wW9sdSU 5a5vlFLAsjMeg9y8zu4PHZL+rFTKkrPrOfI7I94XiMvY+r5wJBGMQR4KsuzqVX+vUqQc 3lliufn+FqxCA8p/vQ2uRMum6g6tlL9fTZrzSgcqQocGwt+D/nPJKFTVTkXDJYQKm2+g 0/lF01/exVJRKbCB6PMfUa4EqSKW6ICylBxTGmrbvpH+Ned80OmOSpzS4mpjy/+62YP7 /+Mg== X-Gm-Message-State: AOAM530UsSzTXP9cArs6AZoXiVthqPt6WLXIcLDHPByrH9ZSjQArHG8F T7RmMt2VngdkoP1TfYYQbKvyxPnG1G6miEDqxKs= X-Google-Smtp-Source: ABdhPJzvW6IUpVMs91xSLe98fXdOUT8sI4vPNPAeJr0Bczx9rN+XoO52cx3qR5xUryIC3s5oKdexgQ== X-Received: by 2002:a05:620a:1729:b0:648:a992:cd47 with SMTP id az41-20020a05620a172900b00648a992cd47mr7462423qkb.53.1645880634306; Sat, 26 Feb 2022 05:03: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 k125-20020a378883000000b006491db6dbb1sm2486706qkd.84.2022.02.26.05.03.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 26 Feb 2022 05:03:53 -0800 (PST) From: Philip McGrath Date: Sat, 26 Feb 2022 08:02:46 -0500 Message-Id: <20220226130254.1301333-15-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220226130254.1301333-1-philip@philipmcgrath.com> References: <20220220060610.178131-1-philip@philipmcgrath.com> <20220226130254.1301333-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 0a84a07247..43332c06ad 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: