From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id zjpYAE4YVmEnJgEAgWs5BA (envelope-from ) for ; Thu, 30 Sep 2021 22:04:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id aA6PNk0YVmFEQQAAbx9fmQ (envelope-from ) for ; Thu, 30 Sep 2021 20:04:29 +0000 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 11EF23414F for ; Thu, 30 Sep 2021 22:04:29 +0200 (CEST) Received: from localhost ([::1]:36724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW2I8-0005G3-23 for larch@yhetil.org; Thu, 30 Sep 2021 16:04:28 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633032269; 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=2+1Vib024xB2NXE74ubJ7YrfUT1kaYv84TlZbWOWdeE=; b=M1OmqntKDzOmXKLFN4Bu6/wQ8aRXlkCQKTDGjNOlJaavzUUtVmXXY99tXzIlWNhgmkdTxS BJsNlpLeIrE693rmVEGWZtE9hvrcdvKdkaJQ4UjzJYKeDpq3OTdiCYtuLoP0NgRW+IDGYF eYdwgfu+qbvxeXtV+Pl3ClfGbzB+c/S3VhcLsQ1zxlw71eYDS5iiCfq+zTROoGw8E3zD2s OwiqpsU/u9p3gFwEVYzQHSGDAI1uo6DI7yUKTVBa2nPopxQCva74zFYgn58xYrli1MXgRs 9Xl2lbTpYbCaq8PnypHbBjSKr5HEmD3zrij1nwkh0KMfces/QUtYi3A5YdNMhw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633032269; a=rsa-sha256; cv=none; b=Zh3ACcfeSbI+Lf2IGyZFwb979BwdkCxiXWgzl63s4rshJ9Sun8O3w1R7sfWq0ROSs2KGd/ A0MOnmAi9yP2683W35MhGPs11i7jzobbbyLvB4YysSA26QbMMgqk1QTDw697aHk1rdqvwW VSH3P6M+ANzbk2in/KBD5fMZg18i0PThpRlpWTPmoLOa/qg1DrVonFIH2WSeZxjt7ocv0K RpSGXMxiHlasgxqs/L3kh+RFl4O/nXAjXdPrg8t1fIMAftU2B30uwqAOpbWt/xczmTitFU 2Tw7Xc5GDMhlL01b16O6d1VmQYDSsT3+l8xA290qV8ihpi5Gd+eRCZrlfdu1iw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b=Hklekqdq; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b=Hklekqdq; dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 11EF23414F X-Spam-Score: 3.30 X-Migadu-Scanner: scn1.migadu.com X-TUID: 53KePjyP41Yi * 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 -- 2.33.0