Bump buildroot to 2019.02
This commit is contained in:
@@ -0,0 +1,38 @@
|
||||
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,22 +0,0 @@
|
||||
XMLString: Don't call catString if relativePath is null
|
||||
|
||||
https://xerces.apache.org/xerces-c/secadv/CVE-2017-12627.txt
|
||||
|
||||
Upstream status: svn revision 1819998
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
|
||||
--- trunk/src/xercesc/util/PlatformUtils.cpp 2018/01/03 18:58:30 1819997
|
||||
+++ trunk/src/xercesc/util/PlatformUtils.cpp 2018/01/03 18:59:30 1819998
|
||||
@@ -920,7 +920,10 @@
|
||||
|
||||
XMLString::subString(tmpBuf, basePath, 0, (basePtr - basePath + 1), manager);
|
||||
tmpBuf[basePtr - basePath + 1] = 0;
|
||||
- XMLString::catString(tmpBuf, relativePath);
|
||||
+ if (relativePath)
|
||||
+ {
|
||||
+ XMLString::catString(tmpBuf, relativePath);
|
||||
+ }
|
||||
|
||||
removeDotSlash(tmpBuf, manager);
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 26e3f1440bbc75c704fc93ff43a2abbfbe4c0203 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 11 Oct 2018 22:56:50 +0200
|
||||
Subject: [PATCH] fix static linking with curl
|
||||
|
||||
When curl is statically built with openssl support, xerces needs to
|
||||
link with openssl libraries so use pkg_check_modules to get any
|
||||
needed dependencies
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/29ca90fff2c8e38f2edf7240eca3aa3fe7397c45
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
cmake/XercesNetAccessorSelection.cmake | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/XercesNetAccessorSelection.cmake b/cmake/XercesNetAccessorSelection.cmake
|
||||
index 7a63f1f6b..e90fcf034 100644
|
||||
--- a/cmake/XercesNetAccessorSelection.cmake
|
||||
+++ b/cmake/XercesNetAccessorSelection.cmake
|
||||
@@ -31,7 +31,13 @@ if(network)
|
||||
|
||||
# Requires select() which is UNIX only
|
||||
if(UNIX)
|
||||
- find_package(CURL)
|
||||
+ find_package(PkgConfig)
|
||||
+ if (PkgConfig_FOUND)
|
||||
+ pkg_check_modules(CURL libcurl)
|
||||
+ if (NOT CURL_FOUND)
|
||||
+ find_package(CURL)
|
||||
+ endif()
|
||||
+ endif()
|
||||
if(CURL_FOUND)
|
||||
list(APPEND netaccessors curl)
|
||||
endif()
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -4,7 +4,7 @@ config BR2_PACKAGE_XERCES
|
||||
help
|
||||
Xerces-C++ is a validating XML parser written in portable C++.
|
||||
|
||||
http://xml.apache.org/xerces-c/
|
||||
http://xerces.apache.org/xerces-c/
|
||||
|
||||
comment "xerces-c++ needs a toolchain w/ C++, wchar"
|
||||
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
|
||||
|
||||
@@ -1,2 +1,5 @@
|
||||
# From http://www.apache.org/dist/xerces/c/3/sources/xerces-c-3.1.4.tar.xz.sha256
|
||||
sha256 9973cc79481803f8b6652c52faf5195d963f50d209d4f681ec97e2aa014b6241 xerces-c-3.1.4.tar.xz
|
||||
# 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
|
||||
|
||||
# Hash for license file
|
||||
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
|
||||
|
||||
@@ -4,27 +4,26 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
XERCES_VERSION = 3.1.4
|
||||
XERCES_VERSION = 3.2.2
|
||||
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_INSTALL_STAGING = YES
|
||||
XERCES_CONF_OPTS = \
|
||||
--disable-threads \
|
||||
--with-gnu-ld
|
||||
|
||||
define XERCES_DISABLE_SAMPLES
|
||||
$(SED) 's/ samples//' $(@D)/Makefile.in
|
||||
$(SED) 's/add_subdirectory(samples)//' $(@D)/CMakeLists.txt
|
||||
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_CONF_OPTS += --with-icu=$(STAGING_DIR)/usr
|
||||
XERCES_DEPENDENCIES += icu
|
||||
else
|
||||
XERCES_CONF_OPTS += --without-icu
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||
@@ -33,10 +32,16 @@ XERCES_DEPENDENCIES += libiconv
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCURL),y)
|
||||
XERCES_CONF_OPTS += --enable-netaccessor-curl --with-curl=$(STAGING_DIR)/usr/lib
|
||||
XERCES_CONF_OPTS += -Dnetwork-accessor=curl
|
||||
XERCES_DEPENDENCIES += libcurl
|
||||
else
|
||||
XERCES_CONF_OPTS += --disable-network
|
||||
XERCES_CONF_OPTS += -Dnetwork-accessor=socket
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
XERCES_CONF_OPTS += -Dthreads=ON
|
||||
else
|
||||
XERCES_CONF_OPTS += -Dthreads=OFF
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
Reference in New Issue
Block a user