guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RFC: Build system hacks for Guix do not belong in 'source'


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
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux)

Hi Ricardo,

Thanks for investigating.  Please see below for comments.

Ricardo Wurmus <address@hidden> writes:

> From f5e35f488fd1b4f5d916476d7c522783809b0f82 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <address@hidden>
> 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 <address@hidden>
> 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 <package>", 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]