[packages/crossmingw32-pthreads-w32] - new URLs, updated to 2.11.0 (upstream name is pthreads4w now)
qboosh
qboosh at pld-linux.org
Thu Apr 27 20:51:24 CEST 2023
commit eb01a44aef13f72a5676bb2c8cf20131a6a3fb05
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Apr 27 20:54:13 2023 +0200
- new URLs, updated to 2.11.0 (upstream name is pthreads4w now)
crossmingw32-pthreads-w32-sched.patch | 13 ------
crossmingw32-pthreads-w32-timespec.patch | 11 -----
crossmingw32-pthreads-w32.spec | 80 ++++++++++++++++++--------------
3 files changed, 44 insertions(+), 60 deletions(-)
---
diff --git a/crossmingw32-pthreads-w32.spec b/crossmingw32-pthreads-w32.spec
index c0a83d5..66714d5 100644
--- a/crossmingw32-pthreads-w32.spec
+++ b/crossmingw32-pthreads-w32.spec
@@ -1,21 +1,20 @@
Summary: POSIX Threads component implementation for Win32 - MinGW32 cross version
Summary(pl.UTF-8): Implementacja komponentu POSIX Threads dla Win32 - wersja skrośna dla MinGW32
Name: crossmingw32-pthreads-w32
-Version: 2.9.1
-%define dver %(echo %{version} | tr . -)
-Release: 4
+Version: 2.11.0
+Release: 1
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
-Patch1: %{name}-sched.patch
-URL: http://www.sourceware.org/pthreads-win32/
+Source0: https://downloads.sourceforge.net/pthreads4w/pthreads4w-code-v%{version}.zip
+# Source0-md5: 75c3ade4fa6aeff1d1d25d33f6bbce12
+URL: https://sourceforge.net/p/pthreads4w/wiki/Home/
BuildRequires: crossmingw32-gcc
+BuildRequires: crossmingw32-runtime >= 1:5.4.2-2
BuildRequires: sed >= 4.0
-Requires: crossmingw32-runtime
+Requires: crossmingw32-runtime >= 1:5.4.2-2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _enable_debug_packages 0
%define no_install_post_strip 1
%define target i386-mingw32
@@ -37,24 +36,24 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define filterout_c -f[-a-z0-9=]*
%description
-Pthreads-win32 is an Open Source Software implementation of the
-Threads component of the POSIX 1003.1c 1995 Standard for Microsoft's
-Win32 environment. Some functions from POSIX 1003.1b are also
-supported including semaphores. Other related functions include the
-set of read-write lock functions. The library also supports some of
-the functionality of the Open Group's Single Unix specification,
-version 2, namely mutex types.
+Pthreads-win32 (AKA pthreads4w) is an Open Source Software
+implementation of the Threads component of the POSIX 1003.1c 1995
+Standard for Microsoft's Win32 environment. Some functions from POSIX
+1003.1b are also supported including semaphores. Other related
+functions include the set of read-write lock functions. The library
+also supports some of the functionality of the Open Group's Single
+Unix specification, version 2, namely mutex types.
This package contains the cross version for Win32.
%description -l pl.UTF-8
-PThreads-win32 to mająca otwarte źródła implementacja komponentu
-Threads (wątków) ze specyfikacji standardu POSIX 1003.1c z 1995 roku
-dla środowiska Win32 Microsoftu. Obsługiwane są także niektóre funkcje
-z POSIX 1003.1b, w tym semafory. Inne powiązane funkcje to zbiór
-funkcji blokad r/w. Biblioteka obsługuje także część funkcjonalności
-specyfikacji Single Unix w wersji 2 wydanej przez Open Group, a
-konkretnie typy mutex.
+PThreads-win32 (nazywana także pthreads4w) to mająca otwarte źródła
+implementacja komponentu Threads (wątków) ze specyfikacji standardu
+POSIX 1003.1c z 1995 roku dla środowiska Win32 Microsoftu. Obsługiwane
+są także niektóre funkcje z POSIX 1003.1b, w tym semafory. Inne
+powiązane funkcje to zbiór funkcji blokad r/w. Biblioteka obsługuje
+także część funkcjonalności specyfikacji Single Unix w wersji 2
+wydanej przez Open Group, a konkretnie typy mutex.
Ten pakiet zawiera wersję skrośną dla Win32.
@@ -83,32 +82,39 @@ POSIX Threads - DLL library for Windows.
POSIX Threads - biblioteka DLL dla Windows.
%prep
-%setup -q -n pthreads-w32-%{dver}-release
-%patch0 -p1
-%patch1 -p1
+%setup -q -n pthreads4w-code-9808f0b151e6c6efe2d57f3b54a1fb9a19d1eb88
mkdir lib
%build
-for type in GC-inlined GCE-inlined GC-static ; do
+%{__autoconf}
+%{__autoheader}
+%configure \
+ --target=%{target} \
+ --host=%{target}
+
+for type in GC GCE GC-static GCE-static ; do
%{__make} clean
-%{__make} $type \
+%{__make} -j1 $type \
CROSS="%{target}-" \
CC="%{__cc}" \
CXX="%{__cxx}" \
OPT='%{rpmcflags} $(CLEANUP)'
case "$type" in
- GC-inlined)
- %{__mv} libpthreadGC2.a lib/libpthreadGC2.dll.a
- %{__mv} pthreadGC2.dll lib
+ GC)
+ #%{__mv} libpthreadGC2.a lib/libpthreadGC2.dll.a
+ %{__mv} pthreadGC2.dll libpthreadGC2.dll.a lib
;;
- GCE-inlined)
- %{__mv} libpthreadGCE2.a lib/libpthreadGCE2.dll.a
- %{__mv} pthreadGCE2.dll lib
+ GCE)
+ #%{__mv} libpthreadGCE2.a lib/libpthreadGCE2.dll.a
+ %{__mv} pthreadGCE2.dll libpthreadGCE2.dll.a lib
;;
GC-static)
%{__mv} libpthreadGC2.a lib
+ ;;
+ GCE-static)
+ %{__mv} libpthreadGCE2.a lib
esac
done
@@ -122,10 +128,10 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir},%{_dlldir}}
install lib/*.dll $RPM_BUILD_ROOT%{_dlldir}
-install lib/*.a $RPM_BUILD_ROOT%{_libdir}
+cp -p lib/*.a $RPM_BUILD_ROOT%{_libdir}
ln -s libpthreadGC2.dll.a $RPM_BUILD_ROOT%{_libdir}/libpthread.dll.a
ln -s libpthreadGC2.a $RPM_BUILD_ROOT%{_libdir}/libpthread.a
-cp -p pthread.h sched.h semaphore.h $RPM_BUILD_ROOT%{_includedir}
+cp -p _ptw32.h pthread.h sched.h semaphore.h $RPM_BUILD_ROOT%{_includedir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -136,6 +142,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libpthread.dll.a
%{_libdir}/libpthreadGC2.dll.a
%{_libdir}/libpthreadGCE2.dll.a
+%{_includedir}/_ptw32.h
%{_includedir}/pthread.h
%{_includedir}/sched.h
%{_includedir}/semaphore.h
@@ -143,6 +150,7 @@ rm -rf $RPM_BUILD_ROOT
%files static
%defattr(644,root,root,755)
%{_libdir}/libpthreadGC2.a
+%{_libdir}/libpthreadGCE2.a
%{_libdir}/libpthread.a
%files dll
diff --git a/crossmingw32-pthreads-w32-sched.patch b/crossmingw32-pthreads-w32-sched.patch
deleted file mode 100644
index 376c0ff..0000000
--- a/crossmingw32-pthreads-w32-sched.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- pthreads-w32-2-9-1-release/sched.h.orig 2011-06-29 07:10:02.000000000 +0200
-+++ pthreads-w32-2-9-1-release/sched.h 2018-12-20 18:00:33.452320552 +0100
-@@ -117,9 +117,9 @@
- #endif /* PTW32_SCHED_LEVEL >= PTW32_SCHED_LEVEL_MAX */
-
- #if (defined(__MINGW64__) || defined(__MINGW32__)) || defined(_UWIN)
--# if PTW32_SCHED_LEVEL >= PTW32_SCHED_LEVEL_MAX
- /* For pid_t */
- # include <sys/types.h>
-+# if PTW32_SCHED_LEVEL >= PTW32_SCHED_LEVEL_MAX
- /* Required by Unix 98 */
- # include <time.h>
- # else
diff --git a/crossmingw32-pthreads-w32-timespec.patch b/crossmingw32-pthreads-w32-timespec.patch
deleted file mode 100644
index 322132f..0000000
--- a/crossmingw32-pthreads-w32-timespec.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-pthreads-w32.git/commitdiff/eb01a44aef13f72a5676bb2c8cf20131a6a3fb05
More information about the pld-cvs-commit
mailing list