From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: RFC: Build system hacks for Guix do not belong in 'source' Date: Thu, 05 Mar 2015 13:38:48 -0500 Message-ID: <87oao7guh3.fsf_-_@netris.org> 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> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTafN-0002US-QB for guix-devel@gnu.org; Thu, 05 Mar 2015 13:38:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTafI-0004k2-Vi for guix-devel@gnu.org; Thu, 05 Mar 2015 13:38:37 -0500 Received: from world.peace.net ([50.252.239.5]:49131) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTafI-0004jw-Rh for guix-devel@gnu.org; Thu, 05 Mar 2015 13:38:32 -0500 In-Reply-To: <87wq2x81dr.fsf@mango.localdomain> (Ricardo Wurmus's message of "Wed, 04 Mar 2015 12:09:52 +0100") 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: Ricardo Wurmus Cc: guix-devel@gnu.org Hi Ricardo, Thanks for investigating. Please see below for comments. Ricardo Wurmus writes: > From f5e35f488fd1b4f5d916476d7c522783809b0f82 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]: Set LIBDIR to "lib". > --- > gnu/packages/audio.scm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm > index 2783643..66bcdcc 100644 > --- a/gnu/packages/audio.scm > +++ b/gnu/packages/audio.scm > @@ -1119,7 +1119,8 @@ interface.") > (modules '((guix build utils))) > (snippet > '(substitute* "libs/Makefile" > - (("ldconfig") "true"))))) > + (("ldconfig") "true") > + (("^LIBDIR =.*") "LIBDIR = lib\n"))))) > (build-system gnu-build-system) > (arguments > `(#:tests? #f ; no "check" target > -- > 2.1.0 > > From e2f8a5cdbfb490c1d3c180c58fcf990ca403bd90 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]: Set LIBDIR to "lib". > --- > gnu/packages/audio.scm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm > index 66bcdcc..29f08ff 100644 > --- a/gnu/packages/audio.scm > +++ b/gnu/packages/audio.scm > @@ -254,7 +254,8 @@ plugins are provided.") > (modules '((guix build utils))) > (snippet > '(substitute* "libs/Makefile" > - (("/sbin/ldconfig") "true"))))) > + (("/sbin/ldconfig") "true") > + (("^LIBDIR =.*") "LIBDIR = lib\n"))))) > (build-system gnu-build-system) > (arguments > `(#:tests? #f ; no "check" target I don't think we should be making these kinds of changes in 'snippets'. When I ask for the source code via "guix build -S ", I expect freedom fixes and other bug fixes, and maybe even enhancements needed for Guix that would also work fine on other systems (e.g. adding an environment variable). However, the package 'source' should not include build system hacks that are specific to Guix and would interfere with the package functionality on other platforms, IMO. I think that both the 'ldconfig -> true' hack and the LIBDIR substitution should be moved to a build phase for both of these packages. Other opinions? Mark