From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id IFk8Dj3POGG7+gAAgWs5BA (envelope-from ) for ; Wed, 08 Sep 2021 16:57:01 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id eN9dCT3POGEFRwAAbx9fmQ (envelope-from ) for ; Wed, 08 Sep 2021 14:57:01 +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 74C2E2DCBA for ; Wed, 8 Sep 2021 16:57:00 +0200 (CEST) Received: from localhost ([::1]:54760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNz0V-0000yT-H6 for larch@yhetil.org; Wed, 08 Sep 2021 10:56:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNyyd-00060y-CQ for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNyyd-0002mO-58 for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNyyd-000885-4n for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH 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: Wed, 08 Sep 2021 14:55:03 +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: 50476@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163111286231080 (code B ref 50476); Wed, 08 Sep 2021 14:55:03 +0000 Received: (at 50476) by debbugs.gnu.org; 8 Sep 2021 14:54:22 +0000 Received: from localhost ([127.0.0.1]:33310 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxy-000859-5z for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:22 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxu-000849-1n for 50476@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:20 -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=0smi84sY0MbiZRs/5BJj/xRBjH7C0Q3MykFm04xS4W0=; b=p0GusWmSM6lDRjxK2GI6L5Dwu2 BkVXcobKc8DaWVLU7vnXF+otmrc4M/kQyMjTujfUqO3DMekWdsqZeWz3ZWL4U1FlJx3c9l7AULSOT SjtsMtBAe6B3Izu5+VxcqosaRPN4gwvU+z5aQWFg6aTF3QWXUWb6Zk/rRbvTMqhwUS45p3Wfiy8/n hrOkWmOXa8UOx5rXGJDHOB07vCiDSGh9XJ43TaVnocrlraQ9CARuDAlX1yDvv+7L7lUsFGyE6pY3b 61luo2Klp04MvqF7Dl62ZxzedZNqcWRuLt7S6LJlkDa5RKahPbU5VGkFfmK5yg5qg8TkV8RUcp147 itLphyxA==; Received: from [192.168.2.1] (port=55638 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 1mNyxr-000W6b-04; Wed, 08 Sep 2021 20:24:15 +0530 From: Arun Isaac Date: Wed, 8 Sep 2021 20:24:05 +0530 Message-Id: <20210908145413.4652-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210908145413.4652-1-arunisaac@systemreboot.net> References: <20210908145413.4652-1-arunisaac@systemreboot.net> 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: 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=1631113021; 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=0smi84sY0MbiZRs/5BJj/xRBjH7C0Q3MykFm04xS4W0=; b=gUBTUZhlzVy7reD8Ff9MFeBYHIczuprTcvqL6CO3IhNLZIbJcRv51BjteNFPfh+RjyELa1 bdzgFqLIt921J8m/sqtkRNqxc2ODR7URFuPWhx3n1XieY7AOc6CmvWF6hI5K5HrfMdLSz+ bgohOA3xa7WRFo4ELwJBmNxO9yDpbbFkpuFX9h3okKZO4Pl6qSgBdx0QmsqAQJyBLZ4xfF LrNOEdIKXjBoGPwq01UWA/D/ZswRWZwZyJDIdgsCCkbjYfpneaUJulf+Xnxic/SWFg4DCO wexpdRMrCvN9/XF7FXSVOD1TrfX55P4yO+MxDCptx1CMkpea+c55aey1G+HEcA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631113021; a=rsa-sha256; cv=none; b=gqOnaVrGQQIbOH2JX/ONcPi6cndszHNyIXjCd/BsK+QSRSpTX9r+KFfE4HTA+yaFgGXiDj wMpcdsuLohjJ8oLZgXm4zeDqdg5iC5+SRcVNP565551jJP8Bof1KRJ3idCEPA0/KRpwZZX ujeAaTU9IDGvuXUCQ87e9QmmSHGZzUtjowO/Ex6uBso9n8744TjSLWsK2RkW8ijiBvhhlx /CQqXCwvLFYr3VsWh8ZorwU6ELJ1PeGNqRRvMVGOF66jmMnMge71lVWfj6jt7lUQgqlCop fEqkrrJa2QOryo5V9Lf7tANpeKP4Qtol0+4EZIn2hG3teOpvetbjGpP/m6uW3g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b=p0GusWmS; 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-Spam-Score: 3.69 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b=p0GusWmS; 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: 74C2E2DCBA X-Spam-Score: 3.69 X-Migadu-Scanner: scn0.migadu.com X-TUID: hmp+EnISXQqS * 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 26623b7770..c40eea07a9 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