Richard W.M. Jones wrote:
> On Tue, Dec 02, 2008 at 02:01:07PM +0100, Farkas Levente wrote:
> [...]
>
> Yes, these are all possibilities. Do you have a proposed patch?
> Do you use this package?
here's the proposed patch:-)
we plan to use. anyway at the beginning of dec we switch back to the old
mingw system since the new compiler and tool generated exes work strange
(ie. it works but looks like some internal params changed, but may be it
was only our fault, we'll look into it in jan).
--
Levente "Si vis pacem para bellum!"
diff -r ba1970b75898 pthreads/mingw32-pthreads-flags.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pthreads/mingw32-pthreads-flags.patch Mon Dec 29 16:48:37 2008 +0100
@@ -0,0 +1,13 @@
+--- ./GNUmakefile.lfarkas 2008-12-29 16:23:03.000000000 +0100
++++ ./GNUmakefile 2008-12-29 16:23:45.000000000 +0100
+@@ -58,8 +58,8 @@
+ RANLIB = $(CROSS)ranlib
+ RC = $(CROSS)windres
+
+-OPT = $(CLEANUP) -O3 -finline-functions
+-DOPT = $(CLEANUP) -g -O0
++OPT = $(CLEANUP) -O3 -finline-functions -mms-bitfields
++DOPT = $(CLEANUP) -g -O0 -mms-bitfields
+ XOPT =
+
+ RCFLAGS = --include-dir=.
diff -r ba1970b75898 pthreads/mingw32-pthreads.spec
--- a/pthreads/mingw32-pthreads.spec Fri Dec 19 10:11:50 2008 +0000
+++ b/pthreads/mingw32-pthreads.spec Mon Dec 29 16:44:40 2008 +0100
@@ -4,15 +4,15 @@
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}
-%define crazy_version 2-8-0
-
# The tests take ages to run and require Wine.
%define run_tests 0
Name: mingw32-pthreads
Version: 2.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: MinGW pthread library
+
+%define crazy_version %(echo %{version}|tr . -)
License: LGPLv2+
Group: Development/Libraries
@@ -24,6 +24,7 @@ BuildArch: noarch
Patch0: mingw32-pthreads-2.8.0-use-wine-for-tests.patch
Patch1: mingw32-pthreads-2.8.0-no-failing-tests.patch
+Patch2: mingw32-pthreads-flags.patch
BuildRequires: mingw32-filesystem >= 30
BuildRequires: mingw32-gcc
@@ -55,21 +56,23 @@ high-quality solution to this problem.
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
-make clean
-make CROSS=%{_mingw32_host}- GC-inlined
-make CROSS=%{_mingw32_host}- GCE-inlined
+%{_mingw32_make} clean
+%{_mingw32_make} CROSS=%{_mingw32_host}- GC-inlined
+%{_mingw32_make} clean
+%{_mingw32_make} CROSS=%{_mingw32_host}- GCE-inlined
%check
%if %{run_tests}
pushd tests
-make clean
-make QAPC= CC=i686-pc-mingw32-gcc XXCFLAGS="-D__CLEANUP_C" TEST=GC all-pass
-make clean
-make QAPC= CC=i686-pc-mingw32-gcc XXCFLAGS="-D__CLEANUP_C" TEST=GCE all-pass
+%{_mingw32_make} clean
+%{_mingw32_make} QAPC= CC=%{_mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GC
all-pass
+%{_mingw32_make} clean
+%{_mingw32_make} QAPC= CC=%{_mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GCE
all-pass
popd
%endif
@@ -104,5 +107,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Dec 29 2008 Levente Farkas <[email protected]> - 2.8.0-3
+- minor cleanup
+
* Fri Oct 10 2008 Richard W.M. Jones <[email protected]> - 2.8.0-2
- Initial RPM release.
_______________________________________________
fedora-mingw mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/fedora-mingw
