From patchwork Wed Sep 8 14:54:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 32709 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 6101D27BBE3; Wed, 8 Sep 2021 15:56:50 +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 24C2427BBE1 for ; Wed, 8 Sep 2021 15:56:50 +0100 (BST) Received: from localhost ([::1]:54112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNz0L-0000Wn-7J for patchwork@mira.cbaines.net; Wed, 08 Sep 2021 10:56:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNyyd-00060a-2e for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50015) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNyyc-0002lt-Pk for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNyyc-00087w-Op for guix-patches@gnu.org; Wed, 08 Sep 2021 10:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50476] [PATCH 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: Wed, 08 Sep 2021 14:55: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: 50476@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 50476-submit@debbugs.gnu.org id=B50476.163111286231074 (code B ref 50476); Wed, 08 Sep 2021 14:55:02 +0000 Received: (at 50476) by debbugs.gnu.org; 8 Sep 2021 14:54:22 +0000 Received: from localhost ([127.0.0.1]:33308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxx-000851-RP for submit@debbugs.gnu.org; Wed, 08 Sep 2021 10:54:22 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:37680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNyxu-00084A-1w 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=ivl+dC37gdyW33XmDW/GEzMA5sqzC9k5Y5v5SCFalug=; b=Rxt9/d63StvjfnOTDSAOAUv3bk TylxujSiq8sQMtDqeg1Uq/guXVNPSJYU1Wl6cNIfc/VFWrAwJsFcFOwcN2xEcpOopmR+iapSdNjRk 83gDccvigclY0jAEdLXFelQ2ORKMSU+LNEB2tCXQUmkerZQunlUKw2F/fgf8xGMCjtIGwFYlPVV1b f66q5jqqT8n4YRVUElxCGQyVrcZ3HwMGk46rwFhMD7IIqfgtJIP2YW9Sbvu1hyv7uYpomzmnuWr8I 6fGpogbEAZd9huC6huZ25ziZugSkLyx1F4XX7ek7WJ7yDLijn/5Wap9cZ4lXrPIGgT3673bKyJvg/ Bir/trSQ==; 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-56; Wed, 08 Sep 2021 20:24:15 +0530 From: Arun Isaac Date: Wed, 8 Sep 2021 20:24:06 +0530 Message-Id: <20210908145413.4652-3-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 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+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 LD_LIBRARY_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 c40eea07a9..e8a7fded14 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 "LD_LIBRARY_PATH") + (files '("lib"))))))) (define guile-dbi-bootstrap (package