From b1bde32d05d7b3bd0eb1bf24ec5f536309d9b5174d926391846e078087dbe1a8 Mon Sep 17 00:00:00 2001 From: Guillaume GARDET Date: Tue, 28 Mar 2023 18:12:43 +0000 Subject: [PATCH] Accepting request 1074899 from home:frispete:ML - Apply fix-gcc13-fallout.patch to fix the gcc 13 fallout - Use python3 as the python script interpreter OBS-URL: https://build.opensuse.org/request/show/1074899 OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/ComputeLibrary?expand=0&rev=34 --- ComputeLibrary.changes | 6 ++++++ ComputeLibrary.spec | 3 ++- fix-gcc13-fallout.patch | 48 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 fix-gcc13-fallout.patch diff --git a/ComputeLibrary.changes b/ComputeLibrary.changes index a9472d8..26fa52d 100644 --- a/ComputeLibrary.changes +++ b/ComputeLibrary.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 27 21:36:33 UTC 2023 - Hans-Peter Jansen + +- Apply fix-gcc13-fallout.patch to fix the gcc 13 fallout +- Use python3 as the python script interpreter + ------------------------------------------------------------------- Tue Mar 14 13:24:45 UTC 2023 - Guillaume GARDET diff --git a/ComputeLibrary.spec b/ComputeLibrary.spec index 880324a..e262112 100644 --- a/ComputeLibrary.spec +++ b/ComputeLibrary.spec @@ -26,6 +26,7 @@ Summary: ARM Compute Library License: MIT URL: https://developer.arm.com/technologies/compute-library Source: https://github.com/ARM-software/ComputeLibrary/archive/v%{version}.tar.gz#/ComputeLibrary-%{version}.tar.gz +Patch: fix-gcc13-fallout.patch BuildRequires: gcc-c++ BuildRequires: git-core BuildRequires: ocl-icd-devel @@ -132,7 +133,7 @@ install -Dm0755 scripts/* %{buildroot}%{_bindir} rm -f %{buildroot}%{_bindir}/*.h # Fix Python scripts interpreter for pyfile in `ls %{buildroot}%{_bindir}/*.py`; do - sed -i -e 's|#!%{_bindir}/env python|#!%{_bindir}/python|' $pyfile + sed -i -e 's|#!%{_bindir}/env python|#!%{_bindir}/python3|' $pyfile done %post -n libarm_compute%{so_ver} -p /sbin/ldconfig diff --git a/fix-gcc13-fallout.patch b/fix-gcc13-fallout.patch new file mode 100644 index 0000000..6047078 --- /dev/null +++ b/fix-gcc13-fallout.patch @@ -0,0 +1,48 @@ +Index: b/src/common/cpuinfo/CpuInfo.h +=================================================================== +--- a/src/common/cpuinfo/CpuInfo.h ++++ b/src/common/cpuinfo/CpuInfo.h +@@ -27,6 +27,7 @@ + #include "src/common/cpuinfo/CpuIsaInfo.h" + #include "src/common/cpuinfo/CpuModel.h" + ++#include + #include + #include + +Index: b/arm_compute/core/TensorInfo.h +=================================================================== +--- a/arm_compute/core/TensorInfo.h ++++ b/arm_compute/core/TensorInfo.h +@@ -35,6 +35,7 @@ + #include "arm_compute/core/Utils.h" + + #include ++#include + #include + + namespace arm_compute +Index: b/arm_compute/core/Strides.h +=================================================================== +--- a/arm_compute/core/Strides.h ++++ b/arm_compute/core/Strides.h +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + namespace arm_compute + { +Index: b/arm_compute/core/utils/misc/Utility.h +=================================================================== +--- a/arm_compute/core/utils/misc/Utility.h ++++ b/arm_compute/core/utils/misc/Utility.h +@@ -28,6 +28,7 @@ + + #include + #include ++#include + #include + #include + #include