Bump Buildroot to 2021.02-rc3 (#1260)
* Rebase patches to Buildroot 2021.02-rc3 * Update Buildroot to 2021.02-rc3 * Declare Kernel headers to be Linux version 5.10 (since they are, and new Buildroot knows about 5.10)
This commit is contained in:
@@ -0,0 +1,37 @@
|
||||
From 16848d6da27140caf922f71a233f96a508fb061e Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 24 Jan 2021 12:38:37 +0100
|
||||
Subject: [PATCH] CMakeLists.txt: add BUILD_BENCHMARKS
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/libgeos/geos/pull/395]
|
||||
---
|
||||
CMakeLists.txt | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index c8b39bac..8ca6b829 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -48,6 +48,7 @@ option(BUILD_SHARED_LIBS "Build GEOS with shared libraries" ON)
|
||||
set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard version to use (default is 11)")
|
||||
|
||||
## GEOS custom variables
|
||||
+option(BUILD_BENCHMARKS "Build GEOS benchmarks" ON)
|
||||
cmake_dependent_option(GEOS_BUILD_DEVELOPER
|
||||
"Build with compilation flags useful for development" ON
|
||||
"GEOS_BUILD_FROM_GIT" OFF)
|
||||
@@ -292,7 +293,9 @@ endif()
|
||||
#-----------------------------------------------------------------------------
|
||||
# Benchmarks
|
||||
#-----------------------------------------------------------------------------
|
||||
-add_subdirectory(benchmarks)
|
||||
+if(BUILD_BENCHMARKS)
|
||||
+ add_subdirectory(benchmarks)
|
||||
+endif()
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Utils
|
||||
--
|
||||
2.29.2
|
||||
|
||||
15
buildroot/package/libgeos/Config.in
Normal file
15
buildroot/package/libgeos/Config.in
Normal file
@@ -0,0 +1,15 @@
|
||||
config BR2_PACKAGE_LIBGEOS
|
||||
bool "libgeos"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_WCHAR
|
||||
help
|
||||
GEOS (Geometry Engine - Open Source) is a C++ port of the
|
||||
JTS Topology Suite (JTS). It aims to contain the complete
|
||||
functionality of JTS in C++. This includes all the OpenGIS
|
||||
Simple Features for SQL spatial predicate functions and
|
||||
spatial operators, as well as specific JTS enhanced functions.
|
||||
|
||||
https://trac.osgeo.org/geos
|
||||
|
||||
comment "libgeos needs a toolchain w/ C++, wchar"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
|
||||
3
buildroot/package/libgeos/libgeos.hash
Normal file
3
buildroot/package/libgeos/libgeos.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 bd8082cf12f45f27630193c78bdb5a3cba847b81e72b20268356c2a4fc065269 geos-3.9.0.tar.bz2
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
28
buildroot/package/libgeos/libgeos.mk
Normal file
28
buildroot/package/libgeos/libgeos.mk
Normal file
@@ -0,0 +1,28 @@
|
||||
################################################################################
|
||||
#
|
||||
# libgeos
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBGEOS_VERSION = 3.9.0
|
||||
LIBGEOS_SITE = http://download.osgeo.org/geos
|
||||
LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2
|
||||
LIBGEOS_LICENSE = LGPL-2.1
|
||||
LIBGEOS_LICENSE_FILES = COPYING
|
||||
LIBGEOS_INSTALL_STAGING = YES
|
||||
LIBGEOS_CONFIG_SCRIPTS = geos-config
|
||||
LIBGEOS_CONF_OPTS = -DBUILD_BENCHMARKS=OFF
|
||||
|
||||
LIBGEOS_CXXFLAGS = $(TARGET_CXXCFLAGS)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y)
|
||||
LIBGEOS_CXXFLAGS += -O0
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_arm)$(BR2_armeb),y)
|
||||
LIBGEOS_CONF_OPTS += -DDISABLE_GEOS_INLINE=ON
|
||||
endif
|
||||
|
||||
LIBGEOS_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(LIBGEOS_CXXFLAGS)"
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user