[Buildroot] [PATCH v1] package/kmsxx: fix gcc-10.x compile
Peter Korsgaard
peter at korsgaard.com
Mon Nov 30 07:53:40 UTC 2020
>>>>> "Peter" == Peter Seiderer <ps.report at gmx.net> writes:
Hi,
>> > +++ b/package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch
>> > @@ -0,0 +1,27 @@
>> > +From f7ee1e8c96ffbfc645487e483b928d250a7e79ec Mon Sep 17 00:00:00 2001
>> > +From: Tobias Off <sebastianoff at web.de>
>> > +Date: Thu, 8 Oct 2020 22:37:55 +0200
>> > +Subject: [PATCH] added #include <string> to card.h to follow gcc10 porting
>> > + guide
>> > +
>> > +[Upstream: https://github.com/tomba/kmsxx/commit/b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch]
>> > +Signed-off-by: Peter Seiderer <ps.report at gmx.net>
>>
>> NIT: Why do you end with a different commit hash than the upstream one
>> (E.G. The From line)?
> Is a change of the hash not normal while re-basing and adding something to
> the commit message?
If you need to rebase, yes.
> Produced the patch with the following workflow:
> $ wget https://github.com/tomba/kmsxx/commit/b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch
> $ git am b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch
> $ vi kms++/inc/kms++/card.h # fixing re-base conflicts
> $ git add kms++/inc/kms++/card.h
> $ git am --continue
> $ git commit --amend --signoff
> $ git format-patch -1
Given that the patch was just adding a single include, I thought it
would apply cleanly to our version. For such cases, you can simply do:
git clone https://github.com/tomba/kmsxx/
git format-patch -s --start-number=2 \
b53f9d383c9189a897c44cd88a8fc1b871fdc8a2^..b53f9d383c9189a897c44cd88a8fc1b871fdc8a2
0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch
But looking closer, the memory/cstdint includes close to this line would
indeed give issues.
--
Bye, Peter Korsgaard
More information about the buildroot
mailing list