From 9a65f3be54519d406e7e9ae899f065c7ac123e3e Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Apr 15 2020 22:01:56 +0000 Subject: Add patch to fix build on i686 --- diff --git a/mraa.spec b/mraa.spec index 34892b8..55ad774 100644 --- a/mraa.spec +++ b/mraa.spec @@ -16,8 +16,10 @@ URL: https://projects.eclipse.org/projects/iot.mraa Source0: https://github.com/intel-iot-devkit/mraa/archive/v%{version}.tar.gz # add patch to disable network access (via git) during build Patch0: mraa_no-network-access-v%{version}.patch +# fix build on i686 +Patch1: mraa_fix_i686_build-v%{version}.patch # https://github.com/eclipse/mraa/pull/1012 -Patch1: mraa_include-Declare-gVERSION-global-as-extern-v%{version}.patch +Patch2: mraa_include-Declare-gVERSION-global-as-extern-v%{version}.patch # To quote "Only x86, arm and mock platforms currently supported" ExcludeArch: %{power64} s390x @@ -165,6 +167,7 @@ chmod 0755 %{buildroot}%{nodejs_sitelib}/mraa/mraa.node * Wed Apr 15 2020 Björn Esser - 2.1.0-1 - Update to 2.1.0 - Disable Nodejs package, as SWIG does not support Nodejs >= 12 +- Add patch to fix build on i686 * Mon Apr 13 2020 Björn Esser - 2.0.0-8 - Fix build with '-fno-common' diff --git a/mraa_fix_i686_build-v2.1.0.patch b/mraa_fix_i686_build-v2.1.0.patch new file mode 100644 index 0000000..343f6c2 --- /dev/null +++ b/mraa_fix_i686_build-v2.1.0.patch @@ -0,0 +1,13 @@ +Index: mraa-2.1.0/CMakeLists.txt +=================================================================== +--- mraa-2.1.0.orig/CMakeLists.txt ++++ mraa-2.1.0/CMakeLists.txt +@@ -171,7 +171,7 @@ else () + endif() + + if (DETECTED_ARCH STREQUAL "i586" OR DETECTED_ARCH STREQUAL "x86_64" +- OR DETECTED_ARCH STREQUAL "i386") ++ OR DETECTED_ARCH STREQUAL "i686") + set (X86PLAT ON) + elseif (DETECTED_ARCH MATCHES "arm.*" OR DETECTED_ARCH MATCHES "aarch64") + set (ARMPLAT ON)