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:
@@ -1,38 +0,0 @@
|
||||
From c9bfe786331647237b90f5f9e35b4d2cad7aaa69 Mon Sep 17 00:00:00 2001
|
||||
From: Roger Leigh <rleigh@apache.org>
|
||||
Date: Fri, 12 Oct 2018 12:02:58 +0000
|
||||
Subject: [PATCH] cmake: Allow thread checks to fail and fall back to nothreads
|
||||
|
||||
Closes: #2155
|
||||
|
||||
|
||||
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@1843653 13f79535-47bb-0310-9956-ffa450edef68
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from: https://github.com/apache/xerces-c/commit/c9bfe786331647237b90f5f9e35b4d2cad7aaa69]
|
||||
---
|
||||
cmake/XercesMutexMgrSelection.cmake | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cmake/XercesMutexMgrSelection.cmake b/cmake/XercesMutexMgrSelection.cmake
|
||||
index 2f1d71c50..ad698840d 100644
|
||||
--- a/cmake/XercesMutexMgrSelection.cmake
|
||||
+++ b/cmake/XercesMutexMgrSelection.cmake
|
||||
@@ -19,11 +19,15 @@
|
||||
|
||||
# mutexmgr selection
|
||||
|
||||
-option(threads "Threading support" ON)
|
||||
+set(xerces_thread_default ON)
|
||||
+find_package(Threads)
|
||||
+if(NOT TARGET Threads::Threads)
|
||||
+ set(xerces_thread_default ON)
|
||||
+endif()
|
||||
|
||||
-include(CheckCXXSourceCompiles)
|
||||
+option(threads "Threading support" ${xerces_thread_default})
|
||||
|
||||
-find_package(Threads REQUIRED)
|
||||
+include(CheckCXXSourceCompiles)
|
||||
|
||||
function(thread_test outvar)
|
||||
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
||||
@@ -1,5 +1,5 @@
|
||||
# From http://www.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.2.tar.xz.sha256
|
||||
sha256 6daca3b23364d8d883dc77a73f681242f69389e3564543287ed3d073007e0a8e xerces-c-3.2.2.tar.xz
|
||||
# From http://www.apache.org/dist/xerces/c/3/sources/xerces-c-3.2.3.tar.xz.sha256
|
||||
sha256 12fc99a9fc1d1a79bd0e927b8b5637a576d6656f45b0d5e70ee3694d379cc149 xerces-c-3.2.3.tar.xz
|
||||
|
||||
# Hash for license file
|
||||
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
|
||||
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
|
||||
|
||||
@@ -4,11 +4,13 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XERCES_VERSION = 3.2.2
|
||||
XERCES_VERSION = 3.2.3
|
||||
XERCES_SOURCE = xerces-c-$(XERCES_VERSION).tar.xz
|
||||
XERCES_SITE = http://archive.apache.org/dist/xerces/c/3/sources
|
||||
XERCES_LICENSE = Apache-2.0
|
||||
XERCES_LICENSE_FILES = LICENSE
|
||||
XERCES_CPE_ID_VENDOR = apache
|
||||
XERCES_CPE_ID_PRODUCT = xerces-c\+\+
|
||||
XERCES_INSTALL_STAGING = YES
|
||||
|
||||
define XERCES_DISABLE_SAMPLES
|
||||
@@ -17,11 +19,6 @@ endef
|
||||
|
||||
XERCES_POST_PATCH_HOOKS += XERCES_DISABLE_SAMPLES
|
||||
|
||||
# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to
|
||||
# disable a try_run() call in the FindThreads tests, which caused a
|
||||
# build failure when cross-compiling.
|
||||
XERCES_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ICU),y)
|
||||
XERCES_DEPENDENCIES += icu
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user