Bump buildroot to 2019.02
This commit is contained in:
@@ -0,0 +1,56 @@
|
||||
From 878d51187bbc1ad490b4cd15e3741bc0bd11b6b2 Mon Sep 17 00:00:00 2001
|
||||
From: Joel Carlson <JoelsonCarl@gmail.com>
|
||||
Date: Thu, 6 Sep 2018 14:53:20 -0600
|
||||
Subject: [PATCH] CMakeLists.txt: conditionally require C++ based on
|
||||
FLATCC_TEST (#94)
|
||||
|
||||
C++ is only used when building the tests, so only include it as a
|
||||
language via project() when FLATCC_TEST is enabled. This allows
|
||||
toolchains that don't have C++ to build flatcc.
|
||||
|
||||
Signed-off-by: Joel Carlson <JoelsonCarl@gmail.com>
|
||||
---
|
||||
Upstream commit 878d51187bbc1ad490b4cd15e3741bc0bd11b6b2
|
||||
---
|
||||
CMakeLists.txt | 18 ++++++++++++------
|
||||
1 file changed, 12 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b39a3d1..5df5161 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -4,7 +4,18 @@
|
||||
#cmake_minimum_required (VERSION 2.8.11)
|
||||
cmake_minimum_required (VERSION 2.8)
|
||||
|
||||
-project (FlatCC C CXX)
|
||||
+# Disable build of tests and samples. Due to custom build step
|
||||
+# dependency on flatcc tool, some custom build configurations may
|
||||
+# experience issues, and this option can then help.
|
||||
+option(FLATCC_TEST "enable tests" ON)
|
||||
+
|
||||
+# Conditionally set project languages based on FLATCC_TEST, as C++ is
|
||||
+# only necessary if building the tests.
|
||||
+if (FLATCC_TEST)
|
||||
+ project (FlatCC C CXX)
|
||||
+else()
|
||||
+ project (FlatCC C)
|
||||
+endif()
|
||||
|
||||
#
|
||||
# NOTE: when changing build options, clean the build using on of:
|
||||
@@ -35,11 +46,6 @@ option(FLATCC_RTONLY "enable build of runtime library only" OFF)
|
||||
# cmake -DBUILD_SHARED_LIBS=on can override.
|
||||
option(FLATCC_INSTALL "enable build of runtime library only" OFF)
|
||||
|
||||
-# Disable build of tests and samples. Due to custom build step
|
||||
-# dependency on flatcc tool, some custom build configurations may
|
||||
-# experience issues, and this option can then help.
|
||||
-option(FLATCC_TEST "enable tests" ON)
|
||||
-
|
||||
# Use with debug build with testing enabled only. Enables generation
|
||||
# of coverage information during build and run. Adds target "coverage"
|
||||
# which collects data and makes HTML report in build directory
|
||||
--
|
||||
2.7.4
|
||||
|
||||
8
bsp/buildroot/package/flatcc/Config.in
Normal file
8
bsp/buildroot/package/flatcc/Config.in
Normal file
@@ -0,0 +1,8 @@
|
||||
config BR2_PACKAGE_FLATCC
|
||||
bool "flatcc"
|
||||
help
|
||||
flatcc is C language implementation of Google Flatbuffers. It
|
||||
consists of both a library for the target as well as a
|
||||
flatbuffer compiler tool for the host.
|
||||
|
||||
https://github.com/dvidelabs/flatcc
|
||||
3
bsp/buildroot/package/flatcc/flatcc.hash
Normal file
3
bsp/buildroot/package/flatcc/flatcc.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 02dac93d3daf8d0a290aa8711a9b8a53f047436ec5331adb1972389061ec6615 flatcc-v0.5.2.tar.gz
|
||||
sha256 c8f0d9c1f92c658d87ebd854ee7447a3d3912d2c3a5c78c117787be5d5da8af3 LICENSE
|
||||
30
bsp/buildroot/package/flatcc/flatcc.mk
Normal file
30
bsp/buildroot/package/flatcc/flatcc.mk
Normal file
@@ -0,0 +1,30 @@
|
||||
################################################################################
|
||||
#
|
||||
# FLATCC
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FLATCC_VERSION = v0.5.2
|
||||
FLATCC_SITE = $(call github,dvidelabs,flatcc,$(FLATCC_VERSION))
|
||||
FLATCC_LICENSE = Apache-2.0
|
||||
FLATCC_LICENSE_FILES = LICENSE
|
||||
FLATCC_INSTALL_STAGING = YES
|
||||
FLATCC_DEPENDENCIES = host-flatcc
|
||||
|
||||
# Disable build of tests and samples
|
||||
FLATCC_CONF_OPTS += -DFLATCC_TEST=OFF
|
||||
HOST_FLATCC_CONF_OPTS += -DFLATCC_TEST=OFF
|
||||
|
||||
# Enable install targets
|
||||
FLATCC_CONF_OPTS += -DFLATCC_INSTALL=ON
|
||||
HOST_FLATCC_CONF_OPTS += -DFLATCC_INSTALL=ON
|
||||
|
||||
# compiler is named flatcc or flatcc_d depending on BR2_ENABLE_DEBUG value
|
||||
define FLATCC_TARGET_REMOVE_FLATCC_COMPILER
|
||||
rm $(TARGET_DIR)/usr/bin/flatcc*
|
||||
endef
|
||||
|
||||
FLATCC_POST_INSTALL_TARGET_HOOKS += FLATCC_TARGET_REMOVE_FLATCC_COMPILER
|
||||
|
||||
$(eval $(cmake-package))
|
||||
$(eval $(host-cmake-package))
|
||||
Reference in New Issue
Block a user