- added timespec patch (avoid struct timespec conflict with mingw32-runtime time...

diff --git a/crossmingw32-pthreads-w32-timespec.patch b/crossmingw32-pthreads-w32-timespec.patch
new file mode 100644 (file)
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 a189cd945bacb4e42dca233b4e700611d16ac8cf..0b0c2c284df48ac213d7f6e8493b50d477bb9ac4 100644 (file)
--- 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 . -)
 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
 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
 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
 
 %prep
 %setup -q -n pthreads-w32-%{dver}-release

+%patch0 -p1

 
 mkdir lib
 
 
 mkdir lib