From patchwork Thu Sep 30 16:52:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 33764 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 5E0D527BBE3; Thu, 30 Sep 2021 21:04:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CC1DD27BBE1 for ; Thu, 30 Sep 2021 21:04:32 +0100 (BST) Received: from localhost ([::1]:36724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW2IB-0005G3-S9 for patchwork@mira.cbaines.net; Thu, 30 Sep 2021 16:04:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVzIt-0005gN-Af for guix-patches@gnu.org; Thu, 30 Sep 2021 12:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42290) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVzIt-0003IB-1m for guix-patches@gnu.org; Thu, 30 Sep 2021 12:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVzIs-0008DZ-W5 for guix-patches@gnu.org; Thu, 30 Sep 2021 12:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH v2 02/10] gnu: guile-dbi: Remove hard-coded guile effective version. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Sep 2021 16:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= , Arun Isaac Cc: 50476@debbugs.gnu.org Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163302076731514 (code B ref 50476); Thu, 30 Sep 2021 16:53:02 +0000 Received: (at 50476) by debbugs.gnu.org; 30 Sep 2021 16:52:47 +0000 Received: from localhost ([127.0.0.1]:53827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzIc-0008C3-J9 for submit@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:46 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzIY-0008BU-7F for 50476@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=2+1Vib024xB2NXE74ubJ7YrfUT1kaYv84TlZbWOWdeE=; b=HklekqdqxXtkD5fd8Hskwgk4pw h+wjFGUNWDbMXe7DZ3aEvZyPkjawCBCJvryKnSm2n/RpAP4+pJALvdjB0Ub3z4C1lbO82bZytDkWb HZQZg7jufzteBPwd+ZXD/MQF0UxQVjI+yor/KMQQgjIcyhFGocaqQflJxdalNBRMi4thoAmhrnwxQ 0YD+vM9bB3xD+9BPf+kBjHHpDga+Bo8Ic7Xv+xcI3DmwdJSrZffNDO6wwoNTPzV60y1jQS4DQAz+I Bi+Wvg/Gk0+tLVoHqfIhV055IZkt3jgZZn0cdiBbVhQNVLMu9Azkt9E1oA0lrhEjbfJl6TwXCfQ5x ESVzvRvQ==; Received: from [192.168.2.1] (port=15514 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mVzIV-000mG6-80; Thu, 30 Sep 2021 22:22:39 +0530 From: Arun Isaac Date: Thu, 30 Sep 2021 22:22:27 +0530 Message-Id: <20210930165235.13180-3-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <87wnn2j9fs.fsf@gnu.org> References: <87wnn2j9fs.fsf@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 30 Sep 2021 16:04:16 -0400 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 * gnu/packages/guile-xyz.scm (guile-dbi)[arguments]: Import target-guile-effective-version from (guix build guile-build-system). Use target-guile-effective-version to determine the guile effective version. --- gnu/packages/guile-xyz.scm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index d50212fb66..bc7bf63dc5 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1503,9 +1503,15 @@ library}.") "0nswd067gvpy9pnig409ympkw29akh9lb2i6g3w7r18g1s0ivah2")))) (build-system gnu-build-system) (arguments - '(#:configure-flags + `(#:modules (((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:configure-flags (list (string-append - "--with-guile-site-dir=" %output "/share/guile/site/2.2")) + "--with-guile-site-dir=" %output "/share/guile/site/" + (target-guile-effective-version (assoc-ref %build-inputs "guile")))) #:make-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib:" @@ -1514,11 +1520,13 @@ library}.") #:phases (modify-phases %standard-phases (add-after 'install 'patch-extension-path - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dbi.scm (string-append - out "/share/guile/site/2.2/dbi/dbi.scm")) - (ext (string-append out "/lib/libguile-dbi"))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dbi.scm (string-append out "/share/guile/site/" + (target-guile-effective-version + (assoc-ref inputs "guile")) + "/dbi/dbi.scm")) + (ext (string-append out "/lib/libguile-dbi"))) (substitute* dbi.scm (("libguile-dbi") ext)) #t)))))) (inputs