[Buildroot] [PATCH v1] package/kmsxx: fix gcc-10.x compile

Peter Seiderer ps.report at gmx.net
Sun Nov 29 21:42:13 UTC 2020


Hello Peter,

On Sun, 29 Nov 2020 22:22:22 +0100, Peter Korsgaard <peter at korsgaard.com> wrote:

> >>>>> "Peter" == Peter Seiderer <ps.report at gmx.net> writes:
>
>  > Backport upstream commit ([1]) adding missing string include.
>  > Fixes:
>  >   - http://autobuild.buildroot.net/results/53a5f023ae40db18f45ebe7578962914c2d22a44
>
>  >   In file included from .../build/kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9/kms++/inc/kms++/omap/omapcard.h:3,
>  >                    from .../build/kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9/kms++/src/omap/omapcard.cpp:2:
>  >   .../build/kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9/kms++/inc/kms++/card.h:17:18: error: 'string' in namespace 'std' does not name a type
>  >      17 |  Card(const std::string& device);
>  >         |                  ^~~~~~
>
>  > [1] https://github.com/tomba/kmsxx/commit/b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch
>
>  > Signed-off-by: Peter Seiderer <ps.report at gmx.net>
>  > ---
>  >  ...ring-to-card.h-to-follow-gcc10-porti.patch | 27 +++++++++++++++++++
>  >  1 file changed, 27 insertions(+)
>  >  create mode 100644 package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch
>
>  > diff --git a/package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch b/package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch
>  > new file mode 100644
>  > index 0000000000..3febac40e8
>  > --- /dev/null
>  > +++ 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?

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

Regards,
Peter

>
> Committed, thanks.
>




More information about the buildroot mailing list