[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#30734] [PATCH core-updates 2/3] gnu: util-linux: Move '.la' files t
From: |
Marius Bakke |
Subject: |
[bug#30734] [PATCH core-updates 2/3] gnu: util-linux: Move '.la' files to static output. |
Date: |
Tue, 6 Mar 2018 17:56:41 +0100 |
* 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
- [bug#30734] [PATCH core-updates 0/3] nologin and ifconfig profile conflicts, Marius Bakke, 2018/03/06
- [bug#30734] [PATCH core-updates 1/3] gnu: util-linux: Don't build 'nologin'., Marius Bakke, 2018/03/06
- [bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'., Marius Bakke, 2018/03/06
- [bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'., Danny Milosavljevic, 2018/03/06
- [bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'., Ludovic Courtès, 2018/03/07
- [bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'., Marius Bakke, 2018/03/08
- [bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'., Ludovic Courtès, 2018/03/08
- [bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'., Marius Bakke, 2018/03/22
- [bug#30734] [PATCH core-updates 3/3] gnu: net-tools: Don't install 'ifconfig'., Ludovic Courtès, 2018/03/23
[bug#30734] [PATCH core-updates 2/3] gnu: util-linux: Move '.la' files to static output.,
Marius Bakke <=
[bug#30734] [PATCH core-updates 1/3] gnu: util-linux: Don't build 'nologin'., Danny Milosavljevic, 2018/03/06
[bug#30734] [PATCH core-updates 1/3] gnu: util-linux: Don't build 'nologin'., Ludovic Courtès, 2018/03/07