Attachment 134617 Details for Bug 103050 – mingw threads fix

[patch] mingw threads fix

0023-mingw-build-fix-use-win32-threads.patch (text/plain), 1.04 KB, created by Adrian Johnson on 2017-10-02 10:00:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Johnson

Created: 2017-10-02 10:00:06 UTC

Size: 1.04 KB

patch

obsolete

>From 7c2919f93d6b0144daa3fec237ac5234543faa9d Mon Sep 17 00:00:00 2001
>From: Adrian Johnson <ajohnson@redneon.com>
>Date: Mon, 2 Oct 2017 18:40:58 +1030
>Subject: [PATCH 23/24] mingw build fix - use win32 threads
>
>The cmake FindThreads detects both win32 and pthreads on mingw.
>It also attempts a TryRun test for pthreads which won't work with
>a cross compile.
>---
> CMakeLists.txt | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index 1b425415..b69a304b 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -10,9 +10,13 @@ include(MacroOptionalFindPackage)
> find_package(PkgConfig)
> include(MacroEnsureVersion)
> include(MacroBoolTo01)
>-set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
>-set(THREADS_PREFER_PTHREAD_FLAG TRUE)
>-find_package(Threads)
>+if (WIN32)
>+  message("-- Using win32 threads")
>+else()
>+  set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
>+  set(THREADS_PREFER_PTHREAD_FLAG TRUE)
>+  find_package(Threads)
>+endif()
> include(TestBigEndian)
> test_big_endian(WORDS_BIGENDIAN)
> include(CheckFileOffsetBits)
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 103050: 134579 | 134580 | 134581 | 134582 | 134583 | 134584 | 134585 | 134586 | 134587 | 134588 | 134589 | 134592 | 134603 | 134604 | 134605 | 134606 | 134607 | 134608 | 134609 | 134610 | 134611 | 134612 | 134613 | 134617 | 134618 | 134619 | 134692 | 134903 | 134904 | 134906 | 134985 | 135378

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.