guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

91/94: gnu: sqlite: Move static library to separate output.


From: guix-commits
Subject: 91/94: gnu: sqlite: Move static library to separate output.
Date: Thu, 5 Dec 2019 12:15:42 -0500 (EST)

mbakke pushed a commit to branch core-updates
in repository guix.

commit 3a3c9bae7999352e396bd30941913092b470b1f3
Author: Marius Bakke <address@hidden>
Date:   Thu Dec 5 01:10:49 2019 +0100

    gnu: sqlite: Move static library to separate output.
    
    * gnu/packages/sqlite.scm (sqlite)[outputs]: New field.
    [arguments]: Add #:phases.
---
 gnu/packages/sqlite.scm | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm
index d7eb132..195146a 100644
--- a/gnu/packages/sqlite.scm
+++ b/gnu/packages/sqlite.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2016 Efraim Flashner <address@hidden>
 ;;; Copyright © 2016 Ben Woodcroft <address@hidden>
 ;;; Copyright © 2016 David Craven <address@hidden>
-;;; Copyright © 2016, 2017, 2018 Marius Bakke <address@hidden>
+;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke <address@hidden>
 ;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2017 Jelle Licht <address@hidden>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
@@ -65,6 +65,7 @@
               "0q4f57a5995wz9c7dfiqy9zwl0kn0b900nxwinqa3llv13dm0nlc"))))
    (build-system gnu-build-system)
    (inputs `(("readline" ,readline)))
+   (outputs '("out" "static"))
    (arguments
     `(#:configure-flags
       ;; Add -DSQLITE_SECURE_DELETE, -DSQLITE_ENABLE_FTS3,
@@ -75,7 +76,24 @@
                            "-DSQLITE_ENABLE_FTS3 "
                            "-DSQLITE_ENABLE_UNLOCK_NOTIFY "
                            "-DSQLITE_ENABLE_DBSTAT_VTAB "
-                           "-DSQLITE_ENABLE_COLUMN_METADATA"))))
+                           ;; Column metadata is required by GNU Jami and Qt, 
et.al.
+                           "-DSQLITE_ENABLE_COLUMN_METADATA"))
+      #:phases (modify-phases %standard-phases
+                 (add-after 'install 'move-static-library
+                   (lambda* (#:key outputs #:allow-other-keys)
+                     (let* ((out    (assoc-ref outputs "out"))
+                            (static (assoc-ref outputs "static"))
+                            (source (string-append out "/lib/libsqlite3.a")))
+                       (mkdir-p (string-append static "/lib"))
+                       (link source (string-append static "/lib/libsqlite3.a"))
+                       (delete-file source)
+
+                       ;; Remove reference to the static library from the .la 
file
+                       ;; so that Libtool looks for it in the usual places.
+                       (substitute* (string-append out "/lib/libsqlite3.la")
+                         (("^old_library=.*")
+                          "old_library=''\n"))
+                       #t))))))
    (home-page "https://www.sqlite.org/";)
    (synopsis "The SQLite database management system")
    (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]