Skip to contentSkip to conversation

package/libspatialindex: fix build with microblaze

PATCH New Fabrice Fontaine 2 participants 2 messages Apr 24, 2020 – Apr 28, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libspatialindex: fix build with microblaze

Add an upstream patch so the microblaze workaround for gcc bug 68485 won't get ignored

Fixes:
- http://autobuild.buildroot.org/results/e4ad8fdeafce9d4a07d5554d98dfcb2fa5c05568

---
 ...-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/libspatialindex/0002-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch
package/libspatialindex/0002-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch new file +30 -0
new file mode 100644
index 0000000000..fe94020fd8
@@ -0,0 +1,30 @@
+From 26d417b9f981cf9a6df42d89fd297539b96180cb Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Fri, 24 Apr 2020 18:03:31 +0200
+Subject: [PATCH] CMakeLists.txt: fix CMAKE_BUILD_TYPE (#188)
+
+The user is unable to override CMAKE_BUILD_TYPE since version 1.9.1 and
+https://github.com/libspatialindex/libspatialindex/commit/e3bcccf38d9f100b59ccf29f7e1cfa174969decd
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Retrieved from:
+https://github.com/libspatialindex/libspatialindex/commit/26d417b9f981cf9a6df42d89fd297539b96180cb]
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 191ac72..84676a2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -93,8 +93,10 @@ INCLUDE (CheckIncludeFiles)
+ 
+ # note we default to RelWithDebInfo mode
+ if(NOT MSVC_IDE)
++  if(NOT CMAKE_BUILD_TYPE)
+   set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+     "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE)
++  endif()
+   message(STATUS "Setting libspatialindex build type - ${CMAKE_BUILD_TYPE}")
+ endif()
+ 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 package/libspatialindex: fix build with microblaze

Quoted 11 lines · On Fri, 24 Apr 2020 19:53:45 +0200 Fabrice Fontaine…

Add an upstream patch so the microblaze workaround for gcc bug 68485 won't get ignored

Fixes:
- http://autobuild.buildroot.org/results/e4ad8fdeafce9d4a07d5554d98dfcb2fa5c05568

---
 ...-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/libspatialindex/0002-CMakeLists.txt-fix-CMAKE_BUILD_TYPE.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com