From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [PATCH] gnu: Add hdf4 Date: Sat, 28 May 2016 16:32:59 +0200 Message-ID: <87k2iel0bo.fsf@gnu.org> References: <20160523181719.GA11083@jasmine> <20160527171933.GA29109@jasmine> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b6fIa-0002Rm-Nm for guix-devel@gnu.org; Sat, 28 May 2016 10:33:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b6fIV-0006LS-Jq for guix-devel@gnu.org; Sat, 28 May 2016 10:33:07 -0400 In-Reply-To: <20160527171933.GA29109@jasmine> (Leo Famulari's message of "Fri, 27 May 2016 13:19:33 -0400") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Leo Famulari Cc: guix-devel@gnu.org Leo Famulari skribis: > On Wed, May 25, 2016 at 06:42:04PM +0100, Jeremy Robst wrote: >> Hi, >>=20 >> On Tue, 24 May 2016, Eric Bavier wrote: >>=20 >> > Could we apply a variation of the hdf5-config-date.patch? >>=20 >> Ok, I've based a patch on this one, and removed the other unreproduciable >> output, so I've not got a reproduciable build. >>=20 >> > 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. >>=20 >> 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 differen= ces >> 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, =E2=80=98git am=E2=80=99 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--- =E2=80=A6 and then: --8<---------------cut here---------------start------------->8--- $ patch -p1 < .git/rebase-apply/patch=20 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 =E2=80=98git send-emai= l=E2=80=99? Thank you! Ludo=E2=80=99.