14/14: gnu: expat: Install the static library.

[guix-commits]

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

commit a6c292a6f123acc86429722619ccb51ca54f844f
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Jun 5 15:35:42 2021 +0200

    gnu: expat: Install the static library.
    
    * gnu/packages/xml.scm (expat)[outputs]: New field.
    [arguments]: Remove #:configure-flags.  Add #:phases.
    * gnu/packages/commencement.scm (expat-sans-tests)[outputs]: New field.
    [arguments]: Add #:phases.
---
 gnu/packages/commencement.scm |  2 ++
 gnu/packages/xml.scm          | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index bc2e82f..d44d1dd 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3053,6 +3053,7 @@ memoized as a function of '%current-system'."
   (package
     (inherit expat)
     (inputs (%boot0-inputs))
+    (outputs '("out"))
     (arguments
      ;; XXX: Linking 'runtestscpp' fails with things like:
      ;;
@@ -3067,6 +3068,7 @@ memoized as a function of '%current-system'."
             ;; Since we're not passing the right -Wl,-rpath flags, build the
             ;; static library to avoid RUNPATH validation failure.
             `(cons "--disable-shared" ,flags))
+           ((#:phases phases) '%standard-phases)
            ((#:tests? _ #f) #f))))))
 
 (define python-boot0
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 78daa6c..a57a44f 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -135,7 +135,19 @@ the entire document.")
                   "0spvyb9d3hijs4ys3x64cfmilsynl8kv6clfahv8d4lvp86js0yg")))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("--disable-static")))
+     '(#: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")))
+                        (mkdir-p (string-append static "/lib"))
+                        (link (string-append out "/lib/libexpat.a")
+                              (string-append static "/lib/libexpat.a"))
+                        (delete-file (string-append out "/lib/libexpat.a"))
+                        (substitute* (string-append out "/lib/libexpat.la")
+                          (("old_library=.*")
+                           "old_library=''"))))))))
+    (outputs '("out" "static"))
     (home-page "https://libexpat.github.io/";)
     (synopsis "Stream-oriented XML parser library written in C")
     (description