Bump buildroot to 2019.02
This commit is contained in:
@@ -1,33 +0,0 @@
|
||||
From 6cfd9c14ced26c8220f7f7ea99610cbdbfb9eba7 Mon Sep 17 00:00:00 2001
|
||||
From: Theo Debrouwere <theo.debrouwere@skynet.be>
|
||||
Date: Mon, 12 Sep 2016 09:38:56 +0200
|
||||
Subject: [PATCH] Bugfix: check if cxx_long_long_type is present before
|
||||
applying it.
|
||||
|
||||
Check if cxx_long_long_type is present in the list of compiler features
|
||||
before adding it as a target_compile_feature.
|
||||
|
||||
Patch was backported from
|
||||
https://github.com/zeux/pugixml/commit/4dbb5646196a4a3cc94097f1473ef11d1d44df11
|
||||
|
||||
Signed-off-by: Theo Debrouwere <theo.debrouwere@skynet.be>
|
||||
---
|
||||
scripts/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
|
||||
index 40a7ab0..6403753 100644
|
||||
--- a/scripts/CMakeLists.txt
|
||||
+++ b/scripts/CMakeLists.txt
|
||||
@@ -26,7 +26,7 @@ else()
|
||||
endif()
|
||||
|
||||
# Enable C++11 long long for compilers that are capable of it
|
||||
-if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1)
|
||||
+if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1 AND ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_long_long_type;")
|
||||
target_compile_features(pugixml PUBLIC cxx_long_long_type)
|
||||
endif()
|
||||
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@@ -18,5 +18,37 @@ config BR2_PACKAGE_PUGIXML
|
||||
http://pugixml.org/
|
||||
https://github.com/zeux/pugixml
|
||||
|
||||
if BR2_PACKAGE_PUGIXML
|
||||
|
||||
config BR2_PACKAGE_PUGIXML_XPATH_SUPPORT
|
||||
bool "Enable XPath support"
|
||||
default y
|
||||
help
|
||||
When disabled, both XPath interfaces and XPath implementation
|
||||
are excluded from compilation. This option is provided in case
|
||||
you do not need XPath functionality and need to save code
|
||||
space.
|
||||
|
||||
config BR2_PACKAGE_PUGIXML_COMPACT
|
||||
bool "Enable compact mode"
|
||||
help
|
||||
Activates a different internal representation of document
|
||||
storage that is much more memory efficient for documents with
|
||||
a lot of markup (i.e. nodes and attributes), but is slightly
|
||||
slower to parse and access.
|
||||
|
||||
http://pugixml.org/docs/manual.html#dom.memory.compact
|
||||
|
||||
config BR2_PACKAGE_PUGIXML_HEADER_ONLY
|
||||
bool "Enable header-only version"
|
||||
help
|
||||
All source code for pugixml will be included in every
|
||||
translation unit that includes pugixml.hpp. This is how most
|
||||
of Boost and STL libraries work.
|
||||
|
||||
http://pugixml.org/docs/manual.html#install.building.header
|
||||
|
||||
endif
|
||||
|
||||
comment "pugixml needs a toolchain w/ C++"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 fbe10d46f61d769f7d92a296102e4e2bd3ee16130f11c5b10a1aae590ea1f5ca pugixml-1.7.tar.gz
|
||||
sha256 d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6 pugixml-1.9.tar.gz
|
||||
sha256 5f2318fdea73711b4761fd395462a51dc7d4626088ebaa41732b598821ac935a readme.txt
|
||||
|
||||
@@ -4,12 +4,30 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PUGIXML_VERSION = 1.7
|
||||
PUGIXML_VERSION = 1.9
|
||||
PUGIXML_SITE = http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION)
|
||||
PUGIXML_LICENSE = MIT
|
||||
PUGIXML_LICENSE_FILES = readme.txt
|
||||
PUGIXML_INSTALL_STAGING = YES
|
||||
|
||||
PUGIXML_SUBDIR = scripts
|
||||
# Pugixml will automatically enable 'long long' support on C++11 compilers,
|
||||
# which means gcc 4.8+. As gcc always supports the 'long long' type,
|
||||
# force-enable this option to support older gcc versions. See also:
|
||||
# https://gcc.gnu.org/onlinedocs/gcc/Long-Long.html
|
||||
PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),)
|
||||
PUGIXML_BUILD_DEFINES += PUGIXML_NO_XPATH
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_PUGIXML_COMPACT),y)
|
||||
PUGIXML_BUILD_DEFINES += PUGIXML_COMPACT
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y)
|
||||
PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY
|
||||
endif
|
||||
|
||||
ifdef PUGIXML_BUILD_DEFINES
|
||||
PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))"
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
Reference in New Issue
Block a user