From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etFtk-0005o5-Fr for guix-patches@gnu.org; Tue, 06 Mar 2018 11:57:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etFtg-0003NN-Ko for guix-patches@gnu.org; Tue, 06 Mar 2018 11:57:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:40066) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1etFtg-0003ND-H0 for guix-patches@gnu.org; Tue, 06 Mar 2018 11:57:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1etFtg-0005WH-9w for guix-patches@gnu.org; Tue, 06 Mar 2018 11:57:04 -0500 Subject: [bug#30734] [PATCH core-updates 2/3] gnu: util-linux: Move '.la' files to static output. Resent-Message-ID: From: Marius Bakke Date: Tue, 6 Mar 2018 17:56:41 +0100 Message-Id: <20180306165642.4486-2-mbakke@fastmail.com> In-Reply-To: <20180306165642.4486-1-mbakke@fastmail.com> References: <20180306165642.4486-1-mbakke@fastmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30734@debbugs.gnu.org * 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