Set bundle_dummy_pthread_headers to 0
This commit is contained in:
parent
9cc0450d44
commit
7a205d6ec4
@ -1,34 +1,13 @@
|
|||||||
#%%global snapshot_date 20160723
|
%global bundle_dummy_pthread_headers 0
|
||||||
#%%global snapshot_rev 65a0c3298db7cc5cbded63259663cb29e4780a56
|
|
||||||
#%%global snapshot_rev_short %(echo %snapshot_rev | cut -c1-6)
|
|
||||||
#%%global branch v5.x
|
|
||||||
|
|
||||||
#%%global pre rc2
|
|
||||||
|
|
||||||
%global bundle_dummy_pthread_headers 1
|
|
||||||
|
|
||||||
Name: mingw-headers
|
Name: mingw-headers
|
||||||
Version: 6.0.0
|
Version: 6.0.0
|
||||||
Release: 4%{?dist}
|
Release: 5
|
||||||
Summary: Win32/Win64 header files
|
Summary: Win32/Win64 header files
|
||||||
|
|
||||||
License: Public Domain and LGPLv2+ and ZPLv2.1
|
License: Public Domain and LGPLv2+ and ZPLv2.1
|
||||||
URL: http://mingw-w64.sourceforge.net/
|
URL: http://mingw-w64.sourceforge.net/
|
||||||
%if 0%{?snapshot_date}
|
Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.bz2
|
||||||
# To regenerate a snapshot:
|
|
||||||
# Use your regular webbrowser to open https://sourceforge.net/p/mingw-w64/mingw-w64/ci/%{snapshot_rev}/tarball
|
|
||||||
# This triggers the SourceForge instructure to generate a snapshot
|
|
||||||
# After that you can pull in the archive with:
|
|
||||||
# spectool -g mingw-headers.spec
|
|
||||||
Source0: http://sourceforge.net/code-snapshots/git/m/mi/mingw-w64/mingw-w64.git/mingw-w64-mingw-w64-%{snapshot_rev}.zip
|
|
||||||
%else
|
|
||||||
Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}%{?pre:-%{pre}}.tar.bz2
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Our RPM macros automatically set the environment variable WIDL
|
|
||||||
# This confuses the mingw-headers configure scripts and causes various
|
|
||||||
# headers to be regenerated from their .idl source. Prevent this from
|
|
||||||
# happening as the .idl files shouldn't be used by default
|
|
||||||
Patch0: mingw-headers-no-widl.patch
|
Patch0: mingw-headers-no-widl.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
@ -48,8 +27,8 @@ Requires: mingw32-filesystem >= 95
|
|||||||
Requires: mingw32-winpthreads
|
Requires: mingw32-winpthreads
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Obsoletes: mingw32-w32api < 3.17-3%{?dist}
|
Obsoletes: mingw32-w32api < 3.17-3
|
||||||
Provides: mingw32-w32api = 3.17-3%{?dist}
|
Provides: mingw32-w32api = 3.17-3
|
||||||
|
|
||||||
%description -n mingw32-headers
|
%description -n mingw32-headers
|
||||||
MinGW Windows cross-compiler Win32 header files.
|
MinGW Windows cross-compiler Win32 header files.
|
||||||
@ -66,15 +45,7 @@ MinGW Windows cross-compiler Win64 header files.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%if 0%{?snapshot_date}
|
%autosetup -p1 -n mingw-w64-v%{version}
|
||||||
rm -rf mingw-w64-v%{version}
|
|
||||||
mkdir mingw-w64-v%{version}
|
|
||||||
cd mingw-w64-v%{version}
|
|
||||||
unzip %{S:0}
|
|
||||||
%autosetup -p1 -D -T -n mingw-w64-v%{version}/mingw-w64-mingw-w64-%{snapshot_rev}
|
|
||||||
%else
|
|
||||||
%autosetup -p1 -n mingw-w64-v%{version}%{?pre:-%{pre}}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -88,7 +59,6 @@ pushd mingw-w64-headers
|
|||||||
%mingw_make_install DESTDIR=%{buildroot}
|
%mingw_make_install DESTDIR=%{buildroot}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# Drop the dummy pthread headers if necessary
|
|
||||||
%if 0%{?bundle_dummy_pthread_headers} == 0
|
%if 0%{?bundle_dummy_pthread_headers} == 0
|
||||||
rm -f %{buildroot}%{mingw32_includedir}/pthread_signal.h
|
rm -f %{buildroot}%{mingw32_includedir}/pthread_signal.h
|
||||||
rm -f %{buildroot}%{mingw32_includedir}/pthread_time.h
|
rm -f %{buildroot}%{mingw32_includedir}/pthread_time.h
|
||||||
@ -109,6 +79,9 @@ rm -f %{buildroot}%{mingw64_includedir}/pthread_unistd.h
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Nov 12 2020 Zhiyi Weng <zhiyi@iscas.ac.cn> - 6.0.0-5
|
||||||
|
- Set bundle_dummy_pthread_headers to 0
|
||||||
|
|
||||||
* Fri Oct 16 2020 Zhiyi Weng <zhiyi@iscas.ac.cn> - 6.0.0-4
|
* Fri Oct 16 2020 Zhiyi Weng <zhiyi@iscas.ac.cn> - 6.0.0-4
|
||||||
- Set bundle_dummy_pthread_headers to 1
|
- Set bundle_dummy_pthread_headers to 1
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user