15/18: gnu: util-linux: Remove static library reference from '.la' files.

[Marius Bakke]

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

commit de781c05e7dafde6468d371a8e34502b6930fe0a
Author: Marius Bakke <address@hidden>
Date:   Sun Sep 9 11:58:45 2018 +0200

    gnu: util-linux: Remove static library reference from '.la' files.
    
    * gnu/packages/linux.scm (util-linux)[arguments]: Substitute all '.la' 
files.
---
 gnu/packages/linux.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index fc071a1..dad5ba9 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -645,7 +645,14 @@ providing the system administrator with some help in 
common tasks.")
                                      (rename-file file
                                                   (string-append static "/"
                                                                  file)))
-                                   (find-files "lib" "\\.a$")))
+                                   (find-files "lib" "\\.a$"))
+
+                         ;; Remove references to the static library from the 
'.la'
+                         ;; files so that Libtool does the right thing when 
both
+                         ;; the shared and static library is available.
+                         (substitute* (find-files "lib" "\\.la$")
+                           (("old_library=.*") "old_library=''\n")))
+
                        #t))))))
     (inputs `(("zlib" ,zlib)
               ("ncurses" ,ncurses)