From 8442f4abe5143be86c1e54d6400317384431845d Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 9 Dec 2018 13:34:01 +0100 Subject: [PATCH] - added timespec patch (avoid struct timespec conflict with mingw32-runtime time.h); release 3 --- crossmingw32-pthreads-w32-timespec.patch | 11 +++++++++++ crossmingw32-pthreads-w32.spec | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 crossmingw32-pthreads-w32-timespec.patch diff --git a/crossmingw32-pthreads-w32-timespec.patch b/crossmingw32-pthreads-w32-timespec.patch new file mode 100644 index 0000000..322132f --- /dev/null +++ b/crossmingw32-pthreads-w32-timespec.patch @@ -0,0 +1,11 @@ +--- pthreads-w32-2-9-1-release/pthread.h.orig 2012-05-27 06:16:45.000000000 +0200 ++++ pthreads-w32-2-9-1-release/pthread.h 2018-12-09 12:42:13.610057177 +0100 +@@ -315,7 +315,7 @@ + + #if !defined(HAVE_STRUCT_TIMESPEC) + #define HAVE_STRUCT_TIMESPEC +-#if !defined(_TIMESPEC_DEFINED) ++#if !defined(_TIMESPEC_DEFINED) && !defined(__struct_timespec_defined) + #define _TIMESPEC_DEFINED + struct timespec { + time_t tv_sec; diff --git a/crossmingw32-pthreads-w32.spec b/crossmingw32-pthreads-w32.spec index a189cd9..0b0c2c2 100644 --- a/crossmingw32-pthreads-w32.spec +++ b/crossmingw32-pthreads-w32.spec @@ -3,11 +3,12 @@ Summary(pl.UTF-8): Implementacja komponentu POSIX Threads dla Win32 - wersja skr Name: crossmingw32-pthreads-w32 Version: 2.9.1 %define dver %(echo %{version} | tr . -) -Release: 2 +Release: 3 License: LGPL v2.1 Group: Development/Libraries Source0: ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-%{dver}-release.tar.gz # Source0-md5: 36ba827d6aa0fa9f9ae740a35626e2e3 +Patch0: %{name}-timespec.patch URL: http://www.sourceware.org/pthreads-win32/ BuildRequires: crossmingw32-gcc BuildRequires: sed >= 4.0 @@ -82,6 +83,7 @@ POSIX Threads - biblioteka DLL dla Windows. %prep %setup -q -n pthreads-w32-%{dver}-release +%patch0 -p1 mkdir lib -- 2.44.0