[OE-core][zeus][PATCH] binutils: Fix include error in builds

[OE-core][zeus][PATCH] binutils: Fix include error in builds

[Trevor Gamblin]

See [YOCTO #14169]

A user found a problem with binutils in zeus due to a missing
include in the source. Submitting the patch on their behalf.
The issue is fixed in binutils 2.33 upstream.

Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
---
 .../binutils/binutils-2.32.inc                |  1 +
 ...0001-Fix-a-missing-include-of-string.patch | 49 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 meta/recipes-devtools/binutils/binutils/0001-Fix-a-missing-include-of-string.patch

diff --git a/meta/recipes-devtools/binutils/binutils-2.32.inc b/meta/recipes-devtools/binutils/binutils-2.32.inc
index 349c3e1154..1f2d033a6c 100644
--- a/meta/recipes-devtools/binutils/binutils-2.32.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.32.inc
@@ -51,6 +51,7 @@ SRC_URI = "\
      file://CVE-2019-14444.patch \
      file://CVE-2019-17450.patch \
      file://CVE-2019-17451.patch \
+     file://0001-Fix-a-missing-include-of-string.patch \
 "
 S  = "${WORKDIR}/git"
 
diff --git a/meta/recipes-devtools/binutils/binutils/0001-Fix-a-missing-include-of-string.patch b/meta/recipes-devtools/binutils/binutils/0001-Fix-a-missing-include-of-string.patch
new file mode 100644
index 0000000000..9f52ed8938
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0001-Fix-a-missing-include-of-string.patch
@@ -0,0 +1,49 @@
+From 1aaf9d481a7c0e20675df165a4968e255521bea8 Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <trevor.gamblin@windriver.com>
+Date: Wed, 28 Apr 2021 09:25:08 -0400
+Subject: [PATCH] Fix a missing include of <string>
+
+gold/ChangeLog:
+
+2019-06-07  Martin Liska  <mliska@suse.cz>
+
+    * errors.h: Include string.
+
+Upstream-Status: Backport
+(https://github.com/bminor/binutils-gdb/commit/a3972330f)
+
+Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
+---
+ gold/ChangeLog | 3 +++
+ gold/errors.h  | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/gold/ChangeLog b/gold/ChangeLog
+index 458bed793e0..00f804b1bf6 100644
+--- a/gold/ChangeLog
++++ b/gold/ChangeLog
+@@ -2,6 +2,9 @@
+ 
+ 	2.32 Release.
+ 
++2019-06-10  Martin Liska  <mliska@suse.cz>
++
++	* errors.h: Include string.
+ 2019-01-21  Nick Clifton  <nickc@redhat.com>
+ 
+ 	* po/uk.po: Updated Ukranian translation.
+diff --git a/gold/errors.h b/gold/errors.h
+index c26b5586379..ac681e965bb 100644
+--- a/gold/errors.h
++++ b/gold/errors.h
+@@ -24,6 +24,7 @@
+ #define GOLD_ERRORS_H
+ 
+ #include <cstdarg>
++#include <string>
+ 
+ #include "gold-threads.h"
+ 
+-- 
+2.30.2
+
-- 
2.29.2

Re: [OE-core][zeus][PATCH] binutils: Fix include error in builds

[Anuj Mittal]

zeus is not being actively maintained any more. But I had some patches
in my branch [1] and autobuilder was free, so I tried testing. Some of
the configurations fail while installing syslinux-native.


https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/3376/steps/10/logs/step1b

Thanks,

Anuj

[1]
https://git.openembedded.org/openembedded-core-contrib/log/?h=anujm/zeus

On Wed, 2021-04-28 at 10:56 -0400, Trevor Gamblin wrote:
> See [YOCTO #14169]
> 
> A user found a problem with binutils in zeus due to a missing
> include in the source. Submitting the patch on their behalf.
> The issue is fixed in binutils 2.33 upstream.
> 
> Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
> ---
>  .../binutils/binutils-2.32.inc                |  1 +
>  ...0001-Fix-a-missing-include-of-string.patch | 49 +++++++++++++++++++
>  2 files changed, 50 insertions(+)
>  create mode 100644 meta/recipes-devtools/binutils/binutils/0001-Fix-a-
> missing-include-of-string.patch
> 
> diff --git a/meta/recipes-devtools/binutils/binutils-2.32.inc
> b/meta/recipes-devtools/binutils/binutils-2.32.inc
> index 349c3e1154..1f2d033a6c 100644
> --- a/meta/recipes-devtools/binutils/binutils-2.32.inc
> +++ b/meta/recipes-devtools/binutils/binutils-2.32.inc
> @@ -51,6 +51,7 @@ SRC_URI = "\
>       file://CVE-2019-14444.patch \
>       file://CVE-2019-17450.patch \
>       file://CVE-2019-17451.patch \
> +     file://0001-Fix-a-missing-include-of-string.patch \
>  "
>  S  = "${WORKDIR}/git"
>  
> diff --git a/meta/recipes-devtools/binutils/binutils/0001-Fix-a-
> missing-include-of-string.patch b/meta/recipes-
> devtools/binutils/binutils/0001-Fix-a-missing-include-of-string.patch
> new file mode 100644
> index 0000000000..9f52ed8938
> --- /dev/null
> +++ b/meta/recipes-devtools/binutils/binutils/0001-Fix-a-missing-
> include-of-string.patch
> @@ -0,0 +1,49 @@
> +From 1aaf9d481a7c0e20675df165a4968e255521bea8 Mon Sep 17 00:00:00 2001
> +From: Trevor Gamblin <trevor.gamblin@windriver.com>
> +Date: Wed, 28 Apr 2021 09:25:08 -0400
> +Subject: [PATCH] Fix a missing include of <string>
> +
> +gold/ChangeLog:
> +
> +2019-06-07  Martin Liska  <mliska@suse.cz>
> +
> +    * errors.h: Include string.
> +
> +Upstream-Status: Backport
> +(https://github.com/bminor/binutils-gdb/commit/a3972330f)
> +
> +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
> +---
> + gold/ChangeLog | 3 +++
> + gold/errors.h  | 1 +
> + 2 files changed, 4 insertions(+)
> +
> +diff --git a/gold/ChangeLog b/gold/ChangeLog
> +index 458bed793e0..00f804b1bf6 100644
> +--- a/gold/ChangeLog
> ++++ b/gold/ChangeLog
> +@@ -2,6 +2,9 @@
> + 
> +       2.32 Release.
> + 
> ++2019-06-10  Martin Liska  <mliska@suse.cz>
> ++
> ++      * errors.h: Include string.
> + 2019-01-21  Nick Clifton  <nickc@redhat.com>
> + 
> +       * po/uk.po: Updated Ukranian translation.
> +diff --git a/gold/errors.h b/gold/errors.h
> +index c26b5586379..ac681e965bb 100644
> +--- a/gold/errors.h
> ++++ b/gold/errors.h
> +@@ -24,6 +24,7 @@
> + #define GOLD_ERRORS_H
> + 
> + #include <cstdarg>
> ++#include <string>
> + 
> + #include "gold-threads.h"
> + 
> +-- 
> +2.30.2
> +
> 
> 
>