[bug#30734] [PATCH core-updates 2/3] gnu: util-linux: Move '.la' files to static output.

[Marius Bakke <mbakke@fastmail.com>]

* gnu/packages/linux.scm (util-linux)[arguments]: Update 'move-static-libs'
phase to include .la files.  Substitute the output.
---
 gnu/packages/linux.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e63abcea4..dffe2c49c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -608,10 +608,16 @@ providing the system administrator with some help in common tasks.")
                        (mkdir-p (string-append static "/lib"))
                        (with-directory-excursion out
                          (for-each (lambda (file)
+                                     ;; The dynamic linker does not need the '.la'
+                                     ;; files, but libtool might.  Make sure they
+                                     ;; refer to the right output.
+                                     (when (string= ".la" (string-take-right file 3))
+                                       (substitute* file
+                                         ((out) static)))
                                      (rename-file file
                                                   (string-append static "/"
                                                                  file)))
-                                   (find-files "lib" "\\.a$")))
+                                   (find-files "lib" "\\.l?a$")))
                        #t))))))
     (inputs `(("zlib" ,zlib)
               ("ncurses" ,ncurses)
-- 
2.16.2