Re: [PATCH] gnu: Add p7zip.

[Kei Kebreau <kei@openmailbox.org>]

[-- Attachment #1: Type: text/plain, Size: 1926 bytes --]

Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> writes:

> Hi Kei,
>
>> This patch should install p7zip correctly on every architecture
>> supported by Guix. Ideally, this should be tested it on each arch for
>> the sake of completeness and safety. I've got x86_64 covered so far. :-)
>
> thank you for this patch!
>
> I see that you took care of removing non-free parts in a patch and a
> build phase.  Since “guix build -S p7zip” doesn’t run the build phase
> users would still end up with a source archive containing the non-free
> parts.  The best way is thus to remove things in a snippet.
>
> In “shogun” from the “machine-learning” module we remove supporting code
> for non-free features in a snippet by cutting out anything between some
> ifdef markers, but looking at the patch I see that it wouldn’t be
> feasible for p7zip.
>

Perhaps I can just clear the non-free files and add that to the patch?
> About the new configure phase: I think you could avoid copying the
> Makefile by using “#:make-flags” similar to this:
>
>     #:make-flags
>     (list (string-append "-f "
>                          ((string-prefix? "x86_64" system)
>                           "makefile.linux_amd64_asm")
>                          …)
>
> What do you think?
>

I've implemented this successfully like so:

#:make-flags
       (list (let ((system ,(or (%current-target-system)
                                (%current-system))))
               (string-append "-f "
                              (cond
                               ((string-prefix? "x86_64" system)
                                "makefile.linux_amd64_asm")
                               ((string-prefix? "i686" system)
                                "makefile.linux_x86_asm_gcc_4.X")
                               (else
                                "makefile.linux_any_cpu_gcc_4.X")))))

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]