* [Buildroot] [PATCH v2,1/1] xerces: fix build without pthread
@ 2018-10-12 16:54 Fabrice Fontaine
2018-10-20 18:30 ` Thomas Petazzoni
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2018-10-12 16:54 UTC (permalink / raw)
To: buildroot
Don't fail when pthreads is not available
Fixes:
- http://autobuild.buildroot.org/results/63cc4d3d69db19d0c639437d6996f881888a926b
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
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
diff --git a/package/xerces/0001-cmake-Allow-thread-checks-to-fail-and-fall-back-to-nothreads.patch b/package/xerces/0001-cmake-Allow-thread-checks-to-fail-and-fall-back-to-nothreads.patch
new file mode 100644
index 0000000000..8bed7711c4
--- /dev/null
+++ b/package/xerces/0001-cmake-Allow-thread-checks-to-fail-and-fall-back-to-nothreads.patch
@@ -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 at 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})
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH v2,1/1] xerces: fix build without pthread
2018-10-12 16:54 [Buildroot] [PATCH v2,1/1] xerces: fix build without pthread Fabrice Fontaine
@ 2018-10-20 18:30 ` Thomas Petazzoni
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2018-10-20 18:30 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 12 Oct 2018 18:54:33 +0200, Fabrice Fontaine wrote:
> Don't fail when pthreads is not available
>
> Fixes:
> - http://autobuild.buildroot.org/results/63cc4d3d69db19d0c639437d6996f881888a926b
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2:
> - Use the patch merged upstream
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-20 18:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-12 16:54 [Buildroot] [PATCH v2,1/1] xerces: fix build without pthread Fabrice Fontaine
2018-10-20 18:30 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox