From patchwork Tue Mar 28 14:28:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 48765 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 47E5C170F6; Tue, 28 Mar 2023 15:31:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7386C17011 for ; Tue, 28 Mar 2023 15:31:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phAL0-0004jf-3A; Tue, 28 Mar 2023 10:30:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phAKy-0004iW-4C for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phAKx-0006tK-RI for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phAKx-0002cK-N1 for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates v2 17/20] gnu: guile-static: Switch to gexps. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Mar 2023 14:30:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62307 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62307@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 62307-submit@debbugs.gnu.org id=B62307.16800137889859 (code B ref 62307); Tue, 28 Mar 2023 14:30:11 +0000 Received: (at 62307) by debbugs.gnu.org; 28 Mar 2023 14:29:48 +0000 Received: from localhost ([127.0.0.1]:50436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phAKZ-0002Yq-Qe for submit@debbugs.gnu.org; Tue, 28 Mar 2023 10:29:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phAKH-0002Vz-Ki for 62307@debbugs.gnu.org; Tue, 28 Mar 2023 10:29:30 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phAKC-0006T0-Dw; Tue, 28 Mar 2023 10:29:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=MRBDP3tsTOS4R0saS++kEpScBPxBhvdhhXpkAbPxqMA=; b=EIZVA6ROX+6PRjefQDAt hX5l916vv7R0898nnpXwWQveAxY5cCVXrixlJOm0FVfi0qnCYzyti5vOl7c5rPYRQuVfD1FE3Xwk6 2nNSJLirjY2S30+bO2nWRbT1iTevzhKrWxVHDx2XFBcOGTR0zuG0D7HmaeSGXpi2Bd/fpnTgmkyz9 +UaygSYoppJ+5Y8XdbcaqrqWKpEPUs0t5ETs2KpubtF+wrFMIaNLjell5KxOFVhykMqWWpBTHxiAD wM5SWCCb5gwYBaEdcaQFVFqyidBT9+89s9N45YykWt8TvvxibmF8zxH754lmaqJOwDt7/XONemxJV ad7vF0sgrZb3qw==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phAKC-00026Y-0d; Tue, 28 Mar 2023 10:29:24 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 28 Mar 2023 16:28:49 +0200 Message-Id: <20230328142852.26635-18-ludo@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230328142852.26635-1-ludo@gnu.org> References: <87pm90bzva.fsf_-_@gnu.org> <20230328142852.26635-1-ludo@gnu.org> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/make-bootstrap.scm (make-guile-static): Switch to gexps. --- gnu/packages/make-bootstrap.scm | 58 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 2eed01ece8..6bafc5697c 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -613,44 +613,44 @@ (define* (make-guile-static guile patches) (replace "libgc" libgc/static-libs))) (arguments (substitute-keyword-arguments (package-arguments guile) - ((#:configure-flags flags '()) + ((#:configure-flags flags #~'()) ;; When `configure' checks for ltdl availability, it ;; doesn't try to link using libtool, and thus fails ;; because of a missing -ldl. Work around that. - `(list "LDFLAGS=-ldl" "--enable-mini-gmp" + #~(list "LDFLAGS=-ldl" "--enable-mini-gmp" - ;; Guile does an LTO build by default, but in 3.0.9 it - ;; wrongfully picks 'ar' instead of 'gcc-ar', so work around - ;; it (see ). - ,@(if (version-prefix? "3.0" (package-version guile)) - '("AR=gcc-ar" "RANLIB=gcc-ranlib") - '()) + ;; Guile does an LTO build by default, but in 3.0.9 it + ;; wrongfully picks 'ar' instead of 'gcc-ar', so work around + ;; it (see ). + #$@(if (version-prefix? "3.0" (package-version guile)) + #~("AR=gcc-ar" "RANLIB=gcc-ranlib") + #~()) - ,@(if (hurd-target?) - '("--disable-jit") - '()))) + #$@(if (hurd-target?) + #~("--disable-jit") + #~()))) ((#:phases phases '%standard-phases) - `(modify-phases ,phases + #~(modify-phases #$phases - ;; Do not record the absolute file name of 'sh' in - ;; (ice-9 popen). This makes 'open-pipe' unusable in - ;; a build chroot ('open-pipe*' is fine) but avoids - ;; keeping a reference to Bash. - (delete 'pre-configure) + ;; Do not record the absolute file name of 'sh' in + ;; (ice-9 popen). This makes 'open-pipe' unusable in + ;; a build chroot ('open-pipe*' is fine) but avoids + ;; keeping a reference to Bash. + (delete 'pre-configure) - (add-before 'configure 'static-guile - (lambda _ - (substitute* "libguile/Makefile.in" - ;; Create a statically-linked `guile' - ;; executable. - (("^guile_LDFLAGS =") - "guile_LDFLAGS = -all-static") + (add-before 'configure 'static-guile + (lambda _ + (substitute* "libguile/Makefile.in" + ;; Create a statically-linked `guile' + ;; executable. + (("^guile_LDFLAGS =") + "guile_LDFLAGS = -all-static") - ;; Add `-ldl' *after* libguile-2.0.la. - (("^guile_LDADD =(.*)$" _ ldadd) - (string-append "guile_LDADD = " - (string-trim-right ldadd) - " -ldl\n"))))))) + ;; Add `-ldl' *after* libguile-2.0.la. + (("^guile_LDADD =(.*)$" _ ldadd) + (string-append "guile_LDADD = " + (string-trim-right ldadd) + " -ldl\n"))))))) ((#:tests? _ #f) ;; There are uses of `dynamic-link' in ;; {foreign,coverage}.test that don't fly here.