From 7e7e73f680fd69a1492df948f4bca966bca3632a9c98014a9bba99b10983a424 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Wed, 22 Mar 2023 08:09:38 +0000 Subject: [PATCH] Accepting request 1073702 from home:Guillaume_G:branches:science:machinelearning - Add patch to fix build with GCC13: * armnn-fix-gcc13.patch OBS-URL: https://build.opensuse.org/request/show/1073702 OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/armnn?expand=0&rev=70 --- armnn-fix-gcc13.patch | 50 +++++++++++++++++++++++++++++++++++++++++++ armnn.changes | 6 ++++++ armnn.spec | 3 +++ 3 files changed, 59 insertions(+) create mode 100644 armnn-fix-gcc13.patch diff --git a/armnn-fix-gcc13.patch b/armnn-fix-gcc13.patch new file mode 100644 index 0000000..f98d986 --- /dev/null +++ b/armnn-fix-gcc13.patch @@ -0,0 +1,50 @@ +--- armnn-23.02/src/armnnUtils/VerificationHelpers.hpp.orig 2023-03-21 11:42:43.586421589 +0100 ++++ armnn-23.02/src/armnnUtils/VerificationHelpers.hpp 2023-03-21 11:42:58.738601283 +0100 +@@ -7,6 +7,7 @@ + #include + + #include ++#include + + namespace armnnUtils + { +--- armnn-23.02/profiling/client/include/CounterIdMap.hpp.orig 2023-03-21 12:03:05.672831589 +0100 ++++ armnn-23.02/profiling/client/include/CounterIdMap.hpp 2023-03-21 12:03:18.292980107 +0100 +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + namespace arm + { +--- armnn-23.02/profiling/common/include/Counter.hpp.orig 2023-03-21 13:14:21.926470002 +0100 ++++ armnn-23.02/profiling/common/include/Counter.hpp 2023-03-21 13:14:32.046586851 +0100 +@@ -6,6 +6,7 @@ + #pragma once + + #include ++#include + + namespace arm + { +--- armnn-23.02/profiling/client/src/Holder.cpp.orig 2023-03-21 13:28:41.724376732 +0100 ++++ armnn-23.02/profiling/client/src/Holder.cpp 2023-03-21 13:28:55.772538587 +0100 +@@ -4,6 +4,7 @@ + // + + #include ++#include + + namespace arm + { +--- armnn-23.02/profiling/client/include/Holder.hpp.orig 2023-03-21 14:36:13.377591628 +0100 ++++ armnn-23.02/profiling/client/include/Holder.hpp 2023-03-21 14:36:31.325798921 +0100 +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + namespace arm + { diff --git a/armnn.changes b/armnn.changes index 83b2de8..7e0c5f3 100644 --- a/armnn.changes +++ b/armnn.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 21 10:45:26 UTC 2023 - Guillaume GARDET + +- Add patch to fix build with GCC13: + * armnn-fix-gcc13.patch + ------------------------------------------------------------------- Wed Mar 15 09:03:42 UTC 2023 - Guillaume GARDET diff --git a/armnn.spec b/armnn.spec index 1b76208..2c427a9 100644 --- a/armnn.spec +++ b/armnn.spec @@ -79,6 +79,8 @@ Group: Development/Libraries/Other URL: https://developer.arm.com/products/processors/machine-learning/arm-nn Source0: https://github.com/ARM-software/armnn/archive/v%{version}.tar.gz#/armnn-%{version}.tar.gz Source1: armnn-rpmlintrc +# PATCH-FIX-UPSTREAM - https://github.com/ARM-software/armnn/issues/723 +Patch1: armnn-fix-gcc13.patch # PATCHES to add downstream ArmnnExamples binary - https://layers.openembedded.org/layerindex/recipe/87610/ Patch200: 0003-add-more-test-command-line-arguments.patch Patch201: 0005-add-armnn-mobilenet-test-example.patch @@ -372,6 +374,7 @@ This package contains the libarmnnOnnxParser library from armnn. %prep %setup -q -n armnn-%{version} +%patch1 -p1 %if %{with armnn_extra_tests} %patch200 -p1 %patch201 -p1