Re: [PATCH] Various icedtea6 patches

[Ludovic Courtès]

Ricardo Wurmus <address@hidden> skribis:

> From 3bc3dd46ebec97acf424bbc8b3026ee23fdafa19 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <address@hidden>
> Date: Tue, 10 Mar 2015 13:56:55 +0100
> Subject: [PATCH 1/5] gnu: icedtea6: patch ant shebang in unpack phase
>
> * gnu/packages/java.scm (icedtea6)[arguments]: patch bootstrap ant in the
>   `unpack' phase instead of `patch-paths'.

OK.

> From 0d8261286f0d4a14b65359c7f23276f9d166c49e Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <address@hidden>
> Date: Tue, 10 Mar 2015 14:00:55 +0100
> Subject: [PATCH 2/5] gnu: icedtea6: patch hardcoded objcopy path.
>
> * gnu/packages/java.scm (icedtea6)[arguments]: patch Makefile to override
>   DEF_OBJCOPY variable definition.

OK.

> From 9c9ef4fde4003a3bc9af73462552edde5d46c909 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <address@hidden>
> Date: Tue, 10 Mar 2015 14:05:48 +0100
> Subject: [PATCH 3/5] gnu: icedtea6: patch patches in separate build phase.
>
> * gnu/packages/java.scm (icedtea6)[arguments]: patch patches in a separate
>   build phase `patch-patches' instead of `patch-paths'.

Is it really patches that are being patched?  Not obvious from a quick
look.

Anyway, maybe “Move patching from ‘patch-paths’ to new ‘patch-patches’
phase.”

> From 7b4a5b8861de9f8f940d8bf60e225fcafbbb2b1c Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <address@hidden>
> Date: Tue, 10 Mar 2015 17:03:44 +0100
> Subject: [PATCH 4/5] gnu: icedtea6: rename build phase `set-paths'
>
> * gnu/packages/java.scm (icedtea6)[arguments]: Avoid overriding standard
>   `set-paths' phase by renaming new phase to `set-additional-paths'.

Just “Rename ‘set-paths’ phase to ‘set-additional-paths’.”

However the removal of CC and LD_LIBRARY_PATH should be made a separate
patch.

> From 0c2f26564987721c7ec112cfa0d8d714ef4fda01 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <address@hidden>
> Date: Tue, 17 Mar 2015 14:12:14 +0100
> Subject: [PATCH 5/5] gnu: icedtea6: remove commented substitution.
>
> * gnu/packages/java.scm (icedtea6): Remove commented substitution.

OK.

Thanks,
Ludo’.