From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 4GHtIEf6ImQrTAEASxT56A (envelope-from ) for ; Tue, 28 Mar 2023 16:31:35 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 2HidIEf6ImTpTQEAauVa8A (envelope-from ) for ; Tue, 28 Mar 2023 16:31:35 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 146211FA92 for ; Tue, 28 Mar 2023 16:31:35 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=bgczw3zp; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680013895; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=jHk5B9GJnNWYwYegQnqfxj1JSdA6enOCnLUDP6JznuI=; b=CXwI7MgjDUOLPNboyShoEBkGrm+6pkEbyR5HXXlUtlRDWN1HsPPBto9rAAuGTzcYmmhCjR RaMOjW21yyW1qWkDr3YMKqdFsTaR157TBc5QWJ45GwOE9kTsSN9/9adzD05ODEoEJY4kbs nApzDbUMVqKRyTVZIDFlcSi4TPwnNZEVf425USbGH7ri6oyymbmHYWwRv+Hpg1Tlb+Perx sSYf5Wd1mwHjUWWp9g3uQbXfWOSYq/6nwi5SAHT3nEc3wwKNJ4u5DP59OiLPepPXYxOlsn BwGUg3EKh/Mbi2Uw1CfIVcSIOR/H5VusFjUn01DbUJ1ROK3PbKpFbaodDRzjDg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680013895; a=rsa-sha256; cv=none; b=b0+RYWSlSr3gjVPYuX3QM1PLO/Z1TfEGyDBJIu1ESSrl221c35OY7VJTeGel64wetSgyXO iSHoTuYkrPntRsR1xNXke8NN3F1DiTsXVk194LNkFGnVMC4DNc6B2ml1kdtTxtHPFZZ4zW meCBxrE1a7I1ZlkgYP5MlPwsl5a6LhRUkMN3Vyq3ihwslG+6r2VH9EfVhugoKC5TWg61Tr 1uvv9QyCLtv7qxrDqGQ4K157uaspVZRanmdic5M61rUikIqEgEeiloZ+oDtpGtGo0g/ut5 fi+wRIt0N8SLLVYmHObumoMJplcugVfMobPtiQYwbq8ARbast0BW1nYewvld/w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=bgczw3zp; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phAL4-0004mh-CB; Tue, 28 Mar 2023 10:30:18 -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 1phAKz-0004jO-1Y for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:13 -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 1phAKy-0006tj-PD for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phAKy-0002cZ-Fo for guix-patches@gnu.org; Tue, 28 Mar 2023 10:30:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62307] [PATCH core-updates v2 19/20] gnu: guile-readline: 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:12 +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.16800137899874 (code B ref 62307); Tue, 28 Mar 2023 14:30:12 +0000 Received: (at 62307) by debbugs.gnu.org; 28 Mar 2023 14:29:49 +0000 Received: from localhost ([127.0.0.1]:50440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phAKa-0002Z5-Qr for submit@debbugs.gnu.org; Tue, 28 Mar 2023 10:29:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phAKI-0002W8-SO for 62307@debbugs.gnu.org; Tue, 28 Mar 2023 10:29:31 -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 1phAKD-0006Tb-M0; Tue, 28 Mar 2023 10:29:25 -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=jHk5B9GJnNWYwYegQnqfxj1JSdA6enOCnLUDP6JznuI=; b=bgczw3zpjN6SzVVhYQLH QE/qTCgdEIX+/OP0HBSbTXz7AxAG/dL3emJra/uRmi2VB0zprACLzMMbIACtyaBVclnXUENLHmOlH q2Nlbz+FiC2S+RdI+shHJZtuz/UH97gHmu1uLuk9O2ROLIk8NaxZQJZCOwnoZ8ku1Cvokk50p5mll 6hqf4OzAVaP0yIS5UQ3lbfpSyFRwITY8UEflHXQx6KDj/vdsaPlb/9Ptz/XhwFYms6+hUT4fVXVa9 2HUvvB1x4YSYqBn5mOVk8WCT9x0UoCaRkCYYATXe9iFSxkBRcOc3LOxwnnlvhM/elxwPJimr6SmRc drPzlEKQNyaDyQ==; 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 1phAKD-00026Y-8e; Tue, 28 Mar 2023 10:29:25 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 28 Mar 2023 16:28:51 +0200 Message-Id: <20230328142852.26635-20-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 Content-Transfer-Encoding: 8bit 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: X-Migadu-Queue-Id: 146211FA92 X-Spam-Score: -2.03 X-Migadu-Spam-Score: -2.03 X-Migadu-Scanner: scn0.migadu.com List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-TUID: ayF3FvMBpYKI * gnu/packages/guile.scm (make-guile-readline): Switch to gexps. --- gnu/packages/guile.scm | 67 ++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d18c155ab3..8e52448d36 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -470,42 +470,45 @@ (define* (make-guile-readline guile #:optional (name "guile-readline")) (source (package-source guile)) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-silent-rules" - "--enable-mini-gmp") ;for Guile >= 3.0.6 - #:phases (modify-phases %standard-phases - (add-before 'build 'chdir - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" "-C" "libguile" "scmconfig.h") - (invoke "make" "-C" "lib") - (chdir "guile-readline") + (list #:configure-flags + #~'("--disable-silent-rules" + "--enable-mini-gmp") ;for Guile >= 3.0.6 - (substitute* "Makefile" - (("../libguile/libguile-[[:graph:]]+\\.la") - ;; Remove dependency on libguile-X.Y.la. - "") - (("^READLINE_LIBS = (.*)$" _ libs) - ;; Link against the provided libguile. - (string-append "READLINE_LIBS = " - "-lguile-$(GUILE_EFFECTIVE_VERSION) " - libs "\n")) - (("\\$\\(top_builddir\\)/meta/build-env") - ;; Use the provided Guile, not the one from - ;; $(builddir). - "") + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'chdir + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "-C" "libguile" "scmconfig.h") + (invoke "make" "-C" "lib") + (chdir "guile-readline") - ;; Install modules to the 'site' directories. - (("^moddir = .*$") - "moddir = $(pkgdatadir)/site/$(GUILE_EFFECTIVE_VERSION)\n") - (("^ccachedir = .*$") - "ccachedir = $(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/site-ccache\n")) + (substitute* "Makefile" + (("../libguile/libguile-[[:graph:]]+\\.la") + ;; Remove dependency on libguile-X.Y.la. + "") + (("^READLINE_LIBS = (.*)$" _ libs) + ;; Link against the provided libguile. + (string-append "READLINE_LIBS = " + "-lguile-$(GUILE_EFFECTIVE_VERSION) " + libs "\n")) + (("\\$\\(top_builddir\\)/meta/build-env") + ;; Use the provided Guile, not the one from + ;; $(builddir). + "") - ;; Load 'guile-readline.so' from the right place. - (substitute* "ice-9/readline.scm" - (("load-extension \"guile-readline\"") - (format #f "load-extension \ + ;; Install modules to the 'site' directories. + (("^moddir = .*$") + "moddir = $(pkgdatadir)/site/$(GUILE_EFFECTIVE_VERSION)\n") + (("^ccachedir = .*$") + "ccachedir = $(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/site-ccache\n")) + + ;; Load 'guile-readline.so' from the right place. + (substitute* "ice-9/readline.scm" + (("load-extension \"guile-readline\"") + (format #f "load-extension \ (string-append ~s \"/lib/guile/\" (effective-version) \"/extensions/guile-readline\")" - (assoc-ref outputs "out")))) - #t))))) + (assoc-ref outputs "out")))) + #t))))) (home-page (package-home-page guile)) (native-inputs (package-native-inputs guile)) (propagated-inputs (package-propagated-inputs guile)) -- 2.39.2