From: ludo@gnu.org (Ludovic Courtès)
To: Leo Famulari <leo@famulari.name>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] gnu: Add hdf4
Date: Sat, 28 May 2016 16:32:59 +0200 [thread overview]
Message-ID: <87k2iel0bo.fsf@gnu.org> (raw)
In-Reply-To: <20160527171933.GA29109@jasmine> (Leo Famulari's message of "Fri, 27 May 2016 13:19:33 -0400")
Leo Famulari <leo@famulari.name> 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’.
next prev parent reply other threads:[~2016-05-28 14:33 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-23 17:22 [PATCH] gnu: Add hdf4 Jeremy Robst
2016-05-23 18:17 ` Leo Famulari
2016-05-24 13:20 ` Jeremy Robst
2016-05-24 19:06 ` Eric Bavier
2016-05-25 17:42 ` Jeremy Robst
2016-05-27 17:19 ` Leo Famulari
2016-05-28 14:32 ` Ludovic Courtès [this message]
2016-05-29 17:36 ` Jeremy Robst
2016-05-29 22:07 ` Ludovic Courtès
2016-06-02 14:43 ` Eric Bavier
2016-06-02 14:58 ` Jeremy Robst
2016-06-03 8:37 ` Ludovic Courtès
-- strict thread matches above, loose matches on Subject: below --
2016-10-11 8:57 Thomas Danckaert
2016-10-12 12:54 ` Ludovic Courtès
2016-10-12 18:50 ` Thomas Danckaert
2016-10-12 20:28 ` Ludovic Courtès
2016-10-14 8:11 ` Andreas Enge
2016-10-14 11:13 ` Thomas Danckaert
[not found] ` <20161014.110029.603260973900204345.post@thomasdanckaert.be>
2016-10-16 15:05 ` Andreas Enge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k2iel0bo.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=guix-devel@gnu.org \
--cc=leo@famulari.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).