From patchwork Thu Feb 17 20:50:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 37292 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 630A327BBEA; Thu, 17 Feb 2022 20:53:03 +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 ED68727BBE9 for ; Thu, 17 Feb 2022 20:53:02 +0000 (GMT) Received: from localhost ([::1]:35390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nKnlu-0006Q4-30 for patchwork@mira.cbaines.net; Thu, 17 Feb 2022 15:53:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nKnky-00060j-2O for guix-patches@gnu.org; Thu, 17 Feb 2022 15:52:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58874) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nKnkx-0001U9-O7 for guix-patches@gnu.org; Thu, 17 Feb 2022 15:52:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nKnkx-0003Vx-NZ for guix-patches@gnu.org; Thu, 17 Feb 2022 15:52:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v2 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: Thu, 17 Feb 2022 20:52: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: Philip McGrath , zimoun , Ludovic =?utf-8?q?Court=C3=A8s?= , Liliana Marie Prikler , Attila Lendvai , Malte Gerdes Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164513111113434 (code B ref 53878); Thu, 17 Feb 2022 20:52:03 +0000 Received: (at 53878) by debbugs.gnu.org; 17 Feb 2022 20:51:51 +0000 Received: from localhost ([127.0.0.1]:52761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nKnkl-0003UU-7k for submit@debbugs.gnu.org; Thu, 17 Feb 2022 15:51:51 -0500 Received: from mail-qv1-f47.google.com ([209.85.219.47]:41869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nKnke-0003Tr-6C for 53878@debbugs.gnu.org; Thu, 17 Feb 2022 15:51:44 -0500 Received: by mail-qv1-f47.google.com with SMTP id x3so10705975qvd.8 for <53878@debbugs.gnu.org>; Thu, 17 Feb 2022 12:51:44 -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=d75eZuWDpG0Xo8REZER5QZ3Aj707v/oG4QwoThxMJ20X69y7dbE7FL3aKJQbk2tATC QZo/FeyQJ7l24qN7qjEVuQjMzjgdHFiyhstZMDg3UkEpYnrzAwIJN7S7hXuSAZztUo5f NMn+P+zNwyEyZIYwMkSn98Fqz5tsof0RdigbMeDEyB7akDYWJitOqz0O5vSXx8cS9EE8 UEP8geQpyi9NOvHxmIvBETyBQyznFl28mwWEPrdcpUHYtVikCLgCXHpuerwQx1EGANHO 0AxdP2XwDtU1FI4l7fsGTiZm9tX4Ye+oXXky0JjsvYDkd09sgpQCvYQXtdmT3gRLb5hD o5Og== 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=0rBkOY8nxm9FaXc35o6M6UvO1meQN6pZ2vBYVdpsxtJoWIdVaPqtNvqYo/UBvnoPmA nEVTYdA9JbVlSu+hgBZ9v0KUM5sL3TcfigmgzzXTfvRscqK81C4UxWHVZUkQ3aHLUz9a 5DDy60sYj+//a8Hio3KZibyiuiQsVGw6so/4n8b/NkjxrLm2bDvgT8YEF+JU3fFfgVtC Qd0lBs2ojoSzSKHx+bC0jL8blPClm1lYvBDZ06CVjrNd+4VHjSexg2U6vGtbFuM2Y9La AsE93lHNFyXQvkHqbApJi/DjiowNjtWJPB9YxN5dmSev8ZQI57MhrlISZrmIRx69F5cd DpNw== X-Gm-Message-State: AOAM531iHvi8UUdTcdPxy8MvoCIVlur1Y8PedxpUzdR4u/W5HeKzOBst g12QePePFrK5Q1++AUkk7guXJqbWKT5zxVqgOFY= X-Google-Smtp-Source: ABdhPJzDT5YlUxb8rDSZLDoVcjsO7Xwmh52A36fy3DAziZH/uprpWs2ICSuMFO54sawIUZDBqdZf6A== X-Received: by 2002:a05:6214:85:b0:42c:1422:517c with SMTP id n5-20020a056214008500b0042c1422517cmr3488004qvr.72.1645131098627; Thu, 17 Feb 2022 12:51:38 -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 g11sm24525305qtg.49.2022.02.17.12.51.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 17 Feb 2022 12:51:38 -0800 (PST) From: Philip McGrath Date: Thu, 17 Feb 2022 15:50:36 -0500 Message-Id: <20220217205048.967383-4-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220217205048.967383-1-philip@philipmcgrath.com> References: <97f8916ae5bd8d8459bdfd507864f2f55cc217a1.camel@ist.tugraz.at> <20220217205048.967383-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: