Re: [PATCH] gnu: Add hdf4

[Ludovic Courtès]

Leo Famulari <address@hidden> skribis:

> On Wed, May 25, 2016 at 06:42:04PM +0100, Jeremy Robst wrote:
>> Hi,
>> 
>> On Tue, 24 May 2016, Eric Bavier wrote:
>> 
>> > Could we apply a variation of the hdf5-config-date.patch?
>> 
>> Ok, I've based a patch on this one, and removed the other unreproduciable
>> output, so I've not got a reproduciable build.
>> 
>> > This description is noticeably more verbose than that of the hdf5
>> > package. It seems like the first two sentences are not necessary here.
>> > It would also be nice to summarize how hdf4 differs from hdf5.
>> 
>> I've shortened the description, and added a statement that hdf4 is not
>> compatable with hdf5. It's difficult to add more details of the differences
>> without becoming verbose again, but let me know if you think it needs to be
>> tweaked again.
>
> That sounds perfect, but I still can't apply the patch with `git am`,
> although I can't figure out why this is. It *looks* like it should
> apply.
>
> Are you able to apply it to the current master branch (b5d08d7c28)?

Same here.  Specifically, ‘git am’ returns:

--8<---------------cut here---------------start------------->8---
Applying: gnu: Add hdf4
.git/rebase-apply/patch:88: space before tab in indent.
                   HDF4 Version: @H4_VERSION@
.git/rebase-apply/patch:89: space before tab in indent.
                  Configured on: @CONFIG_DATE@
.git/rebase-apply/patch:92: space before tab in indent.
                 Configure mode: @CONFIG_MODE@
.git/rebase-apply/patch:97: space before tab in indent.
                      Libraries: @STATIC_SHARED@
.git/rebase-apply/patch:98: space before tab in indent.
             Installation point: @prefix@
fatal: corrupt patch at line 104
Patch failed at 0001 gnu: Add hdf4
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
--8<---------------cut here---------------end--------------->8---

… and then:

--8<---------------cut here---------------start------------->8---
$ patch -p1 < .git/rebase-apply/patch 
patching file gnu/packages/maths.scm
patching file gnu/packages/patches/hdf4-config-settings.patch
patch: **** malformed patch at line 104: @CFLAGS@
--8<---------------cut here---------------end--------------->8---

Jeremy: could you send it as an attachment, or using ‘git send-email’?

Thank you!

Ludo’.