From patchwork Thu Sep 30 16:52:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 33469 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 17D4527BBE1; Thu, 30 Sep 2021 21:04:55 +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 AE3E727BBE3 for ; Thu, 30 Sep 2021 21:04:54 +0100 (BST) Received: from localhost ([::1]:38044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW2IX-0006Bt-Rn for patchwork@mira.cbaines.net; Thu, 30 Sep 2021 16:04:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVzJq-00060f-Vm for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42306) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVzJq-00047Q-Nv for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVzJq-0008Fs-Lz for guix-patches@gnu.org; Thu, 30 Sep 2021 12:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH v2 03/10] gnu: guile-dbi: Search for dbd libraries using native-search-paths. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Sep 2021 16:54: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.163302079231634 (code B ref 50476); Thu, 30 Sep 2021 16:54:02 +0000 Received: (at 50476) by debbugs.gnu.org; 30 Sep 2021 16:53:12 +0000 Received: from localhost ([127.0.0.1]:53841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzJ2-0008E4-DI for submit@debbugs.gnu.org; Thu, 30 Sep 2021 12:53:12 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37722) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVzIc-0008Bt-Tr for 50476@debbugs.gnu.org; Thu, 30 Sep 2021 12:52:47 -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=kzDqgXm3TLDdFTEbJclH4q98WcaFgb1lNUqUCD32lSM=; b=KqWPZP1wY3+O2Pwtdl58IJQyJL ZD7X4F+BhfetT2qas6CsHcYiv1cEphB6ujW7IrRZnLbzsXBaomUurroGdiRLAVIMyfBwBzE5DTSKi syRzo6tkNLGvrhi47hERvRf/F3IzuZpnP3l3oYA1Yx4QLYaYbiApqH50/Eh60/XCPjQcjC4xc1TsU 6rNriy7qL/Ob/vuV2UwNa1wxpJxdahLLWKybjANWyBjYy0U2Olfar227ieW+iJ+FVzG34wKpFiZeN 2M+RdYOyk0jWSP7Ix86UAO9voZLQ9TNp8cFMFzrFPqjAu7tID6e6B+xDfbJSS546AiClcE5Dm3oQD 0K2t3vhg==; 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-Fc; Thu, 30 Sep 2021 22:22:39 +0530 From: Arun Isaac Date: Thu, 30 Sep 2021 22:22:28 +0530 Message-Id: <20210930165235.13180-4-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]: Do not set LDFLAGS and RPATH in #:make-flags. [inputs]: Remove guile-dbd-sqlite3 and guile-dbd-postgresql. [native-search-paths]: Add GUILE_DBD_PATH. --- gnu/packages/guile-xyz.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index bc7bf63dc5..098988bc1a 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1512,11 +1512,6 @@ library}.") (list (string-append "--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:" - (assoc-ref %build-inputs "guile-dbd-sqlite3") "/lib" ":" - (assoc-ref %build-inputs "guile-dbd-postgresql") "/lib")) #:phases (modify-phases %standard-phases (add-after 'install 'patch-extension-path @@ -1529,9 +1524,6 @@ library}.") (ext (string-append out "/lib/libguile-dbi"))) (substitute* dbi.scm (("libguile-dbi") ext)) #t)))))) - (inputs - `(("guile-dbd-sqlite3" ,guile-dbd-sqlite3) - ("guile-dbd-postgresql" ,guile-dbd-postgresql))) ; only shared library, no scheme files (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -1547,7 +1539,11 @@ library}.") SQL databases. Database programming with guile-dbi is generic in that the same programming interface is presented regardless of which database system is used. It currently supports MySQL, Postgres and SQLite3.") - (license license:gpl2+))) + (license license:gpl2+) + (native-search-paths + (list (search-path-specification + (variable "GUILE_DBD_PATH") + (files '("lib"))))))) (define guile-dbi-bootstrap (package