unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Arun Isaac <arunisaac@systemreboot.net>
To: 50476@debbugs.gnu.org
Cc: Arun Isaac <arunisaac@systemreboot.net>
Subject: [bug#50476] [PATCH 03/10] gnu: guile-dbi: Search for dbd libraries using native-search-paths.
Date: Wed,  8 Sep 2021 20:24:06 +0530	[thread overview]
Message-ID: <20210908145413.4652-3-arunisaac@systemreboot.net> (raw)
In-Reply-To: <20210908145413.4652-1-arunisaac@systemreboot.net>

* 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
-- 
2.33.0





  parent reply	other threads:[~2021-09-08 14:56 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-08 14:45 [bug#50476] [PATCH 00/10] Update guile-dbi and guile-dbd-* Arun Isaac
2021-09-08 14:54 ` [bug#50476] [PATCH 01/10] gnu: guile-dbi: Update upstream source Arun Isaac
2021-09-08 14:54   ` [bug#50476] [PATCH 02/10] gnu: guile-dbi: Remove hard-coded guile effective version Arun Isaac
2021-09-08 14:54   ` Arun Isaac [this message]
2021-09-21 12:53     ` [bug#50476] [PATCH 00/10] Update guile-dbi and guile-dbd-* Ludovic Courtès
2021-09-22 20:23       ` Arun Isaac
2021-09-27 15:59         ` Ludovic Courtès
2021-09-30 16:52           ` [bug#50476] [PATCH v2 " Arun Isaac
2021-10-02 14:04             ` Ludovic Courtès
2021-10-03 15:03               ` bug#50476: " Arun Isaac
2021-09-30 16:52           ` [bug#50476] [PATCH v2 01/10] gnu: guile-dbi: Update upstream source Arun Isaac
2021-09-30 16:52           ` [bug#50476] [PATCH v2 02/10] gnu: guile-dbi: Remove hard-coded guile effective version Arun Isaac
2021-09-30 16:52           ` [bug#50476] [PATCH v2 03/10] gnu: guile-dbi: Search for dbd libraries using native-search-paths Arun Isaac
2021-09-30 16:52           ` [bug#50476] [PATCH v2 04/10] gnu: guile-dbi: Do not return #t from custom phases Arun Isaac
2021-09-30 16:52           ` [bug#50476] [PATCH v2 05/10] gnu: guile-dbi: Update to 2.1.8 Arun Isaac
2021-09-30 16:52           ` [bug#50476] [PATCH v2 06/10] gnu: guile-dbd-sqlite3: Inherit from guile-dbi Arun Isaac
2021-09-30 16:52           ` [bug#50476] [PATCH v2 07/10] gnu: guile-dbd-postgresql: " Arun Isaac
2021-09-30 16:52           ` [bug#50476] [PATCH v2 08/10] gnu: guile-dbi-bootstrap: Remove package Arun Isaac
2021-09-30 16:52           ` [bug#50476] [PATCH v2 09/10] gnu: Add guile-dbd-mysql Arun Isaac
2021-09-08 14:54   ` [bug#50476] [PATCH 04/10] gnu: guile-dbi: Do not return #t from custom phases Arun Isaac
2021-09-08 14:54   ` [bug#50476] [PATCH 05/10] gnu: guile-dbi: Update to 2.1.8 Arun Isaac
2021-09-08 14:54   ` [bug#50476] [PATCH 06/10] gnu: guile-dbd-sqlite3: Inherit from guile-dbi Arun Isaac
2021-09-08 14:54   ` [bug#50476] [PATCH 07/10] gnu: guile-dbd-postgresql: " Arun Isaac
2021-09-08 14:54   ` [bug#50476] [PATCH 08/10] gnu: guile-dbi-bootstrap: Remove package Arun Isaac
2021-09-08 14:54   ` [bug#50476] [PATCH 09/10] gnu: Add guile-dbd-mysql Arun Isaac
2021-09-08 14:54   ` [bug#50476] [PATCH 10/10] gnu: guile-dbd-sqlite3: Use normal variable instead of @ reference Arun Isaac

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210908145413.4652-3-arunisaac@systemreboot.net \
    --to=arunisaac@systemreboot.net \
    --cc=50476@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).