diff mbox series

[meta-tensorflow,scarthgap,PATCHv2] bazel-native: fix build with gcc-15

Message ID 20250817204644.3817415-1-martin.jansa@gmail.com
State New
Headers show
Series [meta-tensorflow,scarthgap,PATCHv2] bazel-native: fix build with gcc-15 | expand

Commit Message

Martin Jansa Aug. 17, 2025, 8:46 p.m. UTC
From: Martin Jansa <martin.jansa@gmail.com>

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
 recipes-devtools/bazel/bazel-native_6.0.0.bb  |  1 +
 .../bazel/files/include_stdint.patch          | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 recipes-devtools/bazel/files/include_stdint.patch

Comments

Hongxu Jia Aug. 18, 2025, 2:16 a.m. UTC | #1
Thanks for your patch, merged

//Hongxu

On 8/18/25 04:46, martin.jansa@gmail.com wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> From: Martin Jansa <martin.jansa@gmail.com>
>
> Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
> ---
>   recipes-devtools/bazel/bazel-native_6.0.0.bb  |  1 +
>   .../bazel/files/include_stdint.patch          | 28 +++++++++++++++++++
>   2 files changed, 29 insertions(+)
>   create mode 100644 recipes-devtools/bazel/files/include_stdint.patch
>
> diff --git a/recipes-devtools/bazel/bazel-native_6.0.0.bb b/recipes-devtools/bazel/bazel-native_6.0.0.bb
> index 29abd0e..04ca4cc 100644
> --- a/recipes-devtools/bazel/bazel-native_6.0.0.bb
> +++ b/recipes-devtools/bazel/bazel-native_6.0.0.bb
> @@ -12,6 +12,7 @@ SRC_URI = "https://github.com/bazelbuild/bazel/releases/download/${PV}/bazel-${P
>              file://0001-cutsomize-native-toolchains-for-Yocto.patch \
>              file://0001-fix-compile-failure-on-gcc-13.patch \
>              file://1f2b3ed4ac717b814d02a0d125f160ddabe78003.patch \
> +           file://include_stdint.patch \
>   "
>
>   inherit python3native
> diff --git a/recipes-devtools/bazel/files/include_stdint.patch b/recipes-devtools/bazel/files/include_stdint.patch
> new file mode 100644
> index 0000000..35c57c2
> --- /dev/null
> +++ b/recipes-devtools/bazel/files/include_stdint.patch
> @@ -0,0 +1,28 @@
> +https://github.com/lihaohong6/COPR/blob/bf48c5450a909cf8358e3cbd81cdde26df426e12/bazel7/include_stdint.patch
> +
> +Upstream-Status: Submitted [https://github.com/bazelbuild/bazel/issues/25514]
> +
> +diff --git a/src/main/cpp/archive_utils.h b/src/main/cpp/archive_utils.h
> +index 18856ab..5298a36 100644
> +--- a/src/main/cpp/archive_utils.h
> ++++ b/src/main/cpp/archive_utils.h
> +@@ -15,6 +15,7 @@
> + #ifndef BAZEL_SRC_MAIN_CPP_ARCHIVE_UTILS_H_
> + #define BAZEL_SRC_MAIN_CPP_ARCHIVE_UTILS_H_
> +
> ++#include <cstdint>
> + #include <string>
> + #include <vector>
> +
> +diff --git a/src/main/cpp/util/logging.h b/src/main/cpp/util/logging.h
> +index b2cd459..7bf5a00 100644
> +--- a/src/main/cpp/util/logging.h
> ++++ b/src/main/cpp/util/logging.h
> +@@ -14,6 +14,7 @@
> + #ifndef BAZEL_SRC_MAIN_CPP_LOGGING_H_
> + #define BAZEL_SRC_MAIN_CPP_LOGGING_H_
> +
> ++#include <cstdint>
> + #include <memory>
> + #include <sstream>
> + #include <string>
Martin Jansa Aug. 18, 2025, 7:29 a.m. UTC | #2
Thanks Hongxu.

Did you apply it manually or something? The Author got mangled in the
process (e-mail instead of the name)
https://git.yoctoproject.org/meta-tensorflow/commit/?h=scarthgap&id=4730f3f8bfeb296f3b94244a5764b40d2ccf7773

It's OK, but please check your process for applying patches.

Cheers,

On Mon, Aug 18, 2025 at 4:16 AM Hongxu Jia <hongxu.jia@windriver.com> wrote:
>
> Thanks for your patch, merged
>
> //Hongxu
>
> On 8/18/25 04:46, martin.jansa@gmail.com wrote:
> > CAUTION: This email comes from a non Wind River email account!
> > Do not click links or open attachments unless you recognize the sender and know the content is safe.
> >
> > From: Martin Jansa <martin.jansa@gmail.com>
> >
> > Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
> > ---
> >   recipes-devtools/bazel/bazel-native_6.0.0.bb  |  1 +
> >   .../bazel/files/include_stdint.patch          | 28 +++++++++++++++++++
> >   2 files changed, 29 insertions(+)
> >   create mode 100644 recipes-devtools/bazel/files/include_stdint.patch
> >
> > diff --git a/recipes-devtools/bazel/bazel-native_6.0.0.bb b/recipes-devtools/bazel/bazel-native_6.0.0.bb
> > index 29abd0e..04ca4cc 100644
> > --- a/recipes-devtools/bazel/bazel-native_6.0.0.bb
> > +++ b/recipes-devtools/bazel/bazel-native_6.0.0.bb
> > @@ -12,6 +12,7 @@ SRC_URI = "https://github.com/bazelbuild/bazel/releases/download/${PV}/bazel-${P
> >              file://0001-cutsomize-native-toolchains-for-Yocto.patch \
> >              file://0001-fix-compile-failure-on-gcc-13.patch \
> >              file://1f2b3ed4ac717b814d02a0d125f160ddabe78003.patch \
> > +           file://include_stdint.patch \
> >   "
> >
> >   inherit python3native
> > diff --git a/recipes-devtools/bazel/files/include_stdint.patch b/recipes-devtools/bazel/files/include_stdint.patch
> > new file mode 100644
> > index 0000000..35c57c2
> > --- /dev/null
> > +++ b/recipes-devtools/bazel/files/include_stdint.patch
> > @@ -0,0 +1,28 @@
> > +https://github.com/lihaohong6/COPR/blob/bf48c5450a909cf8358e3cbd81cdde26df426e12/bazel7/include_stdint.patch
> > +
> > +Upstream-Status: Submitted [https://github.com/bazelbuild/bazel/issues/25514]
> > +
> > +diff --git a/src/main/cpp/archive_utils.h b/src/main/cpp/archive_utils.h
> > +index 18856ab..5298a36 100644
> > +--- a/src/main/cpp/archive_utils.h
> > ++++ b/src/main/cpp/archive_utils.h
> > +@@ -15,6 +15,7 @@
> > + #ifndef BAZEL_SRC_MAIN_CPP_ARCHIVE_UTILS_H_
> > + #define BAZEL_SRC_MAIN_CPP_ARCHIVE_UTILS_H_
> > +
> > ++#include <cstdint>
> > + #include <string>
> > + #include <vector>
> > +
> > +diff --git a/src/main/cpp/util/logging.h b/src/main/cpp/util/logging.h
> > +index b2cd459..7bf5a00 100644
> > +--- a/src/main/cpp/util/logging.h
> > ++++ b/src/main/cpp/util/logging.h
> > +@@ -14,6 +14,7 @@
> > + #ifndef BAZEL_SRC_MAIN_CPP_LOGGING_H_
> > + #define BAZEL_SRC_MAIN_CPP_LOGGING_H_
> > +
> > ++#include <cstdint>
> > + #include <memory>
> > + #include <sstream>
> > + #include <string>
>
>
diff mbox series

Patch

diff --git a/recipes-devtools/bazel/bazel-native_6.0.0.bb b/recipes-devtools/bazel/bazel-native_6.0.0.bb
index 29abd0e..04ca4cc 100644
--- a/recipes-devtools/bazel/bazel-native_6.0.0.bb
+++ b/recipes-devtools/bazel/bazel-native_6.0.0.bb
@@ -12,6 +12,7 @@  SRC_URI = "https://github.com/bazelbuild/bazel/releases/download/${PV}/bazel-${P
            file://0001-cutsomize-native-toolchains-for-Yocto.patch \
            file://0001-fix-compile-failure-on-gcc-13.patch \
            file://1f2b3ed4ac717b814d02a0d125f160ddabe78003.patch \
+           file://include_stdint.patch \
 "
 
 inherit python3native
diff --git a/recipes-devtools/bazel/files/include_stdint.patch b/recipes-devtools/bazel/files/include_stdint.patch
new file mode 100644
index 0000000..35c57c2
--- /dev/null
+++ b/recipes-devtools/bazel/files/include_stdint.patch
@@ -0,0 +1,28 @@ 
+https://github.com/lihaohong6/COPR/blob/bf48c5450a909cf8358e3cbd81cdde26df426e12/bazel7/include_stdint.patch
+
+Upstream-Status: Submitted [https://github.com/bazelbuild/bazel/issues/25514]
+
+diff --git a/src/main/cpp/archive_utils.h b/src/main/cpp/archive_utils.h
+index 18856ab..5298a36 100644
+--- a/src/main/cpp/archive_utils.h
++++ b/src/main/cpp/archive_utils.h
+@@ -15,6 +15,7 @@
+ #ifndef BAZEL_SRC_MAIN_CPP_ARCHIVE_UTILS_H_
+ #define BAZEL_SRC_MAIN_CPP_ARCHIVE_UTILS_H_
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+diff --git a/src/main/cpp/util/logging.h b/src/main/cpp/util/logging.h
+index b2cd459..7bf5a00 100644
+--- a/src/main/cpp/util/logging.h
++++ b/src/main/cpp/util/logging.h
+@@ -14,6 +14,7 @@
+ #ifndef BAZEL_SRC_MAIN_CPP_LOGGING_H_
+ #define BAZEL_SRC_MAIN_CPP_LOGGING_H_
+
++#include <cstdint>
+ #include <memory>
+ #include <sstream>
+ #include <string>