Skip to contentSkip to conversation

xerces: fix build without pthread

PATCH New Fabrice Fontaine 2 participants 2 messages Oct 12, 2018 – Oct 20, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH v2 1/1 xerces: fix build without pthread

Don't fail when pthreads is not available

Fixes:
- http://autobuild.buildroot.org/results/63cc4d3d69db19d0c639437d6996f881888a926b

Signed-off-by Fabrice Fontaine <[email protected]>

---
Changes v1 -> v2:
- Use the patch merged upstream

 ...s-to-fail-and-fall-back-to-nothreads.patch | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 package/xerces/0001-cmake-Allow-thread-checks-to-fail-and-fall-back-to-nothreads.patch
package/xerces/0001-cmake-Allow-thread-checks-to-fail-and-fall-back-to-nothreads.patch new file +38 -0
new file mode 100644
index 0000000000..8bed7711c4
@@ -0,0 +1,38 @@
+From c9bfe786331647237b90f5f9e35b4d2cad7aaa69 Mon Sep 17 00:00:00 2001
+From: Roger Leigh <[email protected]>
+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 at 1843653 13f79535-47bb-0310-9956-ffa450edef68
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[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})
Signature · 1 line
2.17.1
Applied
#1 lore raw

PATCH v2 1/1 xerces: fix build without pthread

Hello,

Quoted 9 lines · Fabrice Fontaine

Don't fail when pthreads is not available

Fixes:
- http://autobuild.buildroot.org/results/63cc4d3d69db19d0c639437d6996f881888a926b

Signed-off-by Fabrice Fontaine <[email protected]>

---
Changes v1 -> v2:
- Use the patch merged upstream

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com