From c85ed19a30396840a62d0283f1d43d06860768cd97664cdd36f6831b2f85fc06 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 22 Sep 2010 14:22:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/windows:mingw:win64/mingw64-runtime?expand=0&rev=15 --- mingw-w64-runtime-1.0b.20100818-crtmess.patch | 47 ++++++------------- mingw64-runtime.spec | 2 + 2 files changed, 17 insertions(+), 32 deletions(-) diff --git a/mingw-w64-runtime-1.0b.20100818-crtmess.patch b/mingw-w64-runtime-1.0b.20100818-crtmess.patch index e3fd172..2a6449b 100644 --- a/mingw-w64-runtime-1.0b.20100818-crtmess.patch +++ b/mingw-w64-runtime-1.0b.20100818-crtmess.patch @@ -1,38 +1,21 @@ ---- Makefile.in (revision 3603) -+++ Makefile.in (revision 3605) -@@ -278,7 +278,6 @@ - crt/lib32_libmingw32_a-pesect.$(OBJEXT) \ - crt/lib32_libmingw32_a-udllargc.$(OBJEXT) \ - crt/lib32_libmingw32_a-xthdloc.$(OBJEXT) \ -- crt/lib32_libmingw32_a-crt0_c.$(OBJEXT) \ - crt/lib32_libmingw32_a-CRT_fp10.$(OBJEXT) \ - crt/lib32_libmingw32_a-dllmain.$(OBJEXT) \ - crt/lib32_libmingw32_a-mingw_custom.$(OBJEXT) \ -@@ -1173,7 +1172,6 @@ - crt/lib64_libmingw32_a-pesect.$(OBJEXT) \ - crt/lib64_libmingw32_a-udllargc.$(OBJEXT) \ - crt/lib64_libmingw32_a-xthdloc.$(OBJEXT) \ -- crt/lib64_libmingw32_a-crt0_c.$(OBJEXT) \ - crt/lib64_libmingw32_a-CRT_fp10.$(OBJEXT) \ - crt/lib64_libmingw32_a-dllmain.$(OBJEXT) \ - crt/lib64_libmingw32_a-mingw_custom.$(OBJEXT) \ -@@ -3008,7 +3006,7 @@ +--- Makefile.am 2010-08-18 12:47:30.000000000 +0200 ++++ Makefile.am 2010-09-22 16:11:01.000000000 +0200 +@@ -53,8 +53,8 @@ + src_libmingw32=include/oscalls.h include/internal.h include/sect_attribs.h \ crt/atonexit.c crt/crt0_c.c crt/dll_argv.c crt/gccmain.c crt/natstart.c crt/pseudo-reloc-list.c crt/wildcard.c \ crt/charmax.c crt/crt0_w.c crt/dllargv.c crt/gs_support.c crt/_newmode.c crt/tlssup.c crt/xncommod.c \ - crt/cinitexe.c crt/crt0_w.c crt/dllentry.c crt/merr.c crt/pesect.c crt/udllargc.c crt/xthdloc.c \ +- crt/cinitexe.c crt/crt0_w.c crt/dllentry.c crt/merr.c crt/pesect.c crt/udllargc.c crt/xthdloc.c \ - crt/crt0_c.c crt/CRT_fp10.c crt/dllmain.c crt/mingw_custom.c crt/mingw_helpers.c crt/pseudo-reloc.c crt/udll_argv.c \ -+ crt/CRT_fp10.c crt/dllmain.c crt/mingw_custom.c crt/mingw_helpers.c crt/pseudo-reloc.c crt/udll_argv.c \ ++ crt/cinitexe.c crt/crt0_w.c crt/merr.c crt/pesect.c crt/udllargc.c crt/xthdloc.c \ ++ crt/CRT_fp10.c crt/mingw_custom.c crt/mingw_helpers.c crt/pseudo-reloc.c crt/udll_argv.c \ crt/xtxtmode.c crt/crt_handler.c \ - crt/tlsthrd.c crt/tlsmthread.c crt/tlsmcrt.c + libsrc/dummy_mingwthrd.c ---- Makefile.am (revision 3603) -+++ Makefile.am (revision 3605) -@@ -79,7 +79,7 @@ - crt/atonexit.c crt/crt0_c.c crt/dll_argv.c crt/gccmain.c crt/natstart.c crt/pseudo-reloc-list.c crt/wildcard.c \ - crt/charmax.c crt/crt0_w.c crt/dllargv.c crt/gs_support.c crt/_newmode.c crt/tlssup.c crt/xncommod.c \ - crt/cinitexe.c crt/crt0_w.c crt/dllentry.c crt/merr.c crt/pesect.c crt/udllargc.c crt/xthdloc.c \ -- crt/crt0_c.c crt/CRT_fp10.c crt/dllmain.c crt/mingw_custom.c crt/mingw_helpers.c crt/pseudo-reloc.c crt/udll_argv.c \ -+ crt/CRT_fp10.c crt/dllmain.c crt/mingw_custom.c crt/mingw_helpers.c crt/pseudo-reloc.c crt/udll_argv.c \ - crt/xtxtmode.c crt/crt_handler.c \ - crt/tlsthrd.c crt/tlsmthread.c crt/tlsmcrt.c +@@ -91,6 +91,7 @@ + libsrc/wspiapi/WspiapiFreeAddrInfo.c + src_libmingwex=\ ++ crt/dllentry.c crt/dllmain.c \ + libsrc/mingwthrd_nomt.c \ + \ + intrincs/inbyte.c intrincs/inbytestring.c intrincs/indword.c intrincs/indwordstring.c \ diff --git a/mingw64-runtime.spec b/mingw64-runtime.spec index 155fc5c..384d6df 100644 --- a/mingw64-runtime.spec +++ b/mingw64-runtime.spec @@ -25,6 +25,7 @@ BuildRequires: mingw64-filesystem BuildRequires: mingw64-cross-binutils BuildRequires: mingw64-cross-gcc-bootstrap >= 4.4.0 BuildRequires: mingw64-headers >= %{version} +BuildRequires: autoconf automake libtool # Once this is installed, mingw64-bootstrap (binary bootstrapper) is no # longer needed. @@ -41,6 +42,7 @@ MinGW Win64 cross-compiler runtime, base libraries. %patch0 -p0 %build +autoreconf -fi ./configure --host=%{_mingw64_target} --prefix=%{_prefix} --with-sysroot=%{_mingw64_sysroot} --disable-lib32 --enable-lib64 make