From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: Re: RFC: Build system hacks for Guix do not belong in 'source' Date: Tue, 10 Mar 2015 09:31:45 +0100 Message-ID: <87vbi96yoe.fsf@mango.localdomain> References: <1424552053-17323-1-git-send-email-rekado@elephly.net> <1424552053-17323-2-git-send-email-rekado@elephly.net> <878ufr6kf0.fsf@mango.localdomain> <87h9udbraa.fsf@mango.localdomain> <871tlexf9r.fsf@gnu.org> <87twy9abtb.fsf@mango.localdomain> <87lhjk61nb.fsf@gnu.org> <87h9u4akv7.fsf@mango.localdomain> <87h9u40vus.fsf@netris.org> <87zj7t8cj8.fsf@mango.localdomain> <87y4nd8cao.fsf@mango.localdomain> <87wq2x81dr.fsf@mango.localdomain> <87oao7guh3.fsf_-_@netris.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVFa4-00009a-Pv for guix-devel@gnu.org; Tue, 10 Mar 2015 04:32:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVFa0-0006YM-16 for guix-devel@gnu.org; Tue, 10 Mar 2015 04:32:00 -0400 Received: from venus.bbbm.mdc-berlin.de ([141.80.25.30]:58383) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVFZz-0006Xu-KW for guix-devel@gnu.org; Tue, 10 Mar 2015 04:31:55 -0400 In-Reply-To: <87oao7guh3.fsf_-_@netris.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Mark H Weaver Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Mark H Weaver writes: > I think that both the 'ldconfig -> true' hack and the LIBDIR > substitution should be moved to a build phase for both of these > packages. Attached are updated patches, moving the build hacks from snippets to a build phase. ~~ Ricardo --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename="0001-gnu-zita-alsa-pcmi-set-LIBDIR-to-lib.patch" >From abdbfec11164c61cfdb6fc88ddf9abd2e58aa027 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Mar 2015 11:50:26 +0100 Subject: [PATCH 1/2] gnu: zita-alsa-pcmi: set LIBDIR to "lib". * gnu/packages/audio.scm (zita-alsa-pcmi)[source, arguments]: Set LIBDIR to "lib" in build phase. Remove snippet. --- gnu/packages/audio.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 64bde2e..c440c4a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1032,11 +1032,7 @@ interface.") version ".tar.bz2")) (sha256 (base32 - "1rgv332g82rrrlm4vdam6p2pyrisxbi7b3izfaa0pcjglafsy7j9")) - (modules '((guix build utils))) - (snippet - '(substitute* "libs/Makefile" - (("ldconfig") "true"))))) + "1rgv332g82rrrlm4vdam6p2pyrisxbi7b3izfaa0pcjglafsy7j9")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target @@ -1044,8 +1040,12 @@ interface.") #:phases (alist-cons-after 'unpack - 'enter-directory - (lambda _ (chdir "libs")) + 'fix-makefile + (lambda _ + (substitute* "libs/Makefile" + (("ldconfig") "true") + (("^LIBDIR =.*") "LIBDIR = lib\n")) + (chdir "libs")) (alist-cons-after 'install 'install-symlink -- 2.1.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename="0002-gnu-clalsadrv-set-LIBDIR-to-lib.patch" >From c114d1fbeda081c13e60a0ec1f776fcf783f1c48 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Mar 2015 11:52:07 +0100 Subject: [PATCH 2/2] gnu: clalsadrv: set LIBDIR to "lib". * gnu/packages/audio.scm (clalsadrv)[source, arguments]: Set LIBDIR to "lib" in build phase. Remove snippet. --- gnu/packages/audio.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index c440c4a..ebbf728 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -244,11 +244,7 @@ plugins are provided.") version ".tar.bz2")) (sha256 (base32 - "0bsacx3l9065gk8g4137qmz2ij7s9x06aldvacinzlcslw7bd1kq")) - (modules '((guix build utils))) - (snippet - '(substitute* "libs/Makefile" - (("/sbin/ldconfig") "true"))))) + "0bsacx3l9065gk8g4137qmz2ij7s9x06aldvacinzlcslw7bd1kq")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target @@ -256,8 +252,12 @@ plugins are provided.") #:phases (alist-cons-after 'unpack - 'enter-directory - (lambda _ (chdir "libs")) + 'fix-makefile + (lambda _ + (substitute* "libs/Makefile" + (("/sbin/ldconfig") "true") + (("^LIBDIR =.*") "LIBDIR = lib\n")) + (chdir "libs")) (alist-cons-after 'install 'install-symlink -- 2.1.0 --=-=-=--