11/22: gnu: isl: Move the static library to a separate output.

[guix-commits]

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

commit 5d8a4354acd081adf9ef55e07ae2cf0a257d1e95
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Feb 6 19:41:36 2020 +0100

    gnu: isl: Move the static library to a separate output.
    
    * gnu/packages/gcc.scm (isl)[outputs, arguments]: New fields.
    * gnu/packages/make-bootstrap.scm (%gcc-static)[inputs]: Add ISL:STATIC.
---
 gnu/packages/gcc.scm            | 21 ++++++++++++++++++++-
 gnu/packages/make-bootstrap.scm |  1 +
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 90cb97e..f9d8b3e 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <address@hidden>
 ;;; Copyright © 2016 Carlos Sánchez de La Lama <address@hidden>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
-;;; Copyright © 2018 Marius Bakke <address@hidden>
+;;; Copyright © 2018, 2020 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -882,6 +882,25 @@ as the 'native-search-paths' field."
               (base32
                "1kf54jib0nind1pvakblnfhimmwzm0y1llz8470ag0di5vwqwrhs"))))
     (build-system gnu-build-system)
+    (outputs '("out" "static"))
+    (arguments
+     '(#: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/libisl.a"))
+                             (target (string-append static "/lib/libisl.a")))
+                        (mkdir-p (dirname target))
+                        (link source target)
+                        (delete-file source)
+
+                        ;; Remove reference to libisl.a from the .la file so
+                        ;; libtool looks for it in the usual locations.
+                        (substitute* (string-append out "/lib/libisl.la")
+                          (("^old_library=.*")
+                           "old_library=''\n"))
+                        #t))))))
     (inputs `(("gmp" ,gmp)))
     (home-page "http://isl.gforge.inria.fr/";)
     (synopsis
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index c193058..ef274a2 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -513,6 +513,7 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                     #t)))))))
      (inputs
       `(("zlib:static" ,zlib "static")
+        ("isl:static" ,isl "static")
         ,@(package-inputs gcc)))
      (native-inputs
       (if (%current-target-system)