windows: switch to new cross build chain

use mingw-w64 winpthread libs
bareos · Sep 29, 2016 · 79c7f8d · 79c7f8d
1 parent 094e67d
commit 79c7f8d
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 24 deletions.
diff --git a/platforms/win32/winbareos-nsi.spec b/platforms/win32/winbareos-nsi.spec
@@ -63,8 +63,8 @@ BuildRequires:  mingw64-readline
 BuildRequires:  mingw32-libstdc++
 BuildRequires:  mingw64-libstdc++
 
-BuildRequires:  mingw32-pthreads
-BuildRequires:  mingw64-pthreads
+BuildRequires:  mingw32-libwinpthread1
+BuildRequires:  mingw64-libwinpthread1
 
 BuildRequires:  mingw32-libqt4
 BuildRequires:  mingw64-libqt4
@@ -81,6 +81,9 @@ BuildRequires:  mingw64-libfastlz
 BuildRequires:  mingw32-sqlite
 BuildRequires:  mingw64-sqlite
 
+BuildRequires:  mingw32-libsqlite
+BuildRequires:  mingw64-libsqlite
+
 BuildRequires:  mingw32-cmocka
 BuildRequires:  mingw64-cmocka
 
@@ -254,7 +257,7 @@ for flavor in %{flavors}; do
       libsqlite3-0.dll \
       libtermcap-0.dll \
       openssl.exe \
-      pthreadGCE2.dll \
+      libwinpthread-1.dll \
       QtCore4.dll \
       QtGui4.dll \
       sed.exe \

diff --git a/platforms/win32/winbareos.nsi b/platforms/win32/winbareos.nsi
@@ -554,7 +554,7 @@ SectionIn 1 2 3 4
   File "libgcc_s_*-1.dll"
   File "libssl-*.dll"
   File "libstdc++-6.dll"
-  File "pthreadGCE2.dll"
+  File "libwinpthread-1.dll"
   File "zlib1.dll"
   File "liblzo2-2.dll"
   File "libfastlz.dll"
@@ -2125,7 +2125,7 @@ ConfDeleteSkip:
   Delete "$INSTDIR\libssl-*.dll"
   Delete "$INSTDIR\libstdc++-6.dll"
   Delete "$INSTDIR\libtermcap-0.dll"
-  Delete "$INSTDIR\pthreadGCE2.dll"
+  Delete "$INSTDIR\libwinpthread-1.dll"
   Delete "$INSTDIR\zlib1.dll"
   Delete "$INSTDIR\QtCore4.dll"
   Delete "$INSTDIR\QtGui4.dll"

diff --git a/platforms/win32/winbareos32.spec b/platforms/win32/winbareos32.spec
@@ -44,8 +44,8 @@ BuildRequires:  %{mingw}-cross-binutils
 BuildRequires:  %{mingw}-cross-pkg-config
 BuildRequires:  %{mingw}-libqt4-devel
 BuildRequires:  %{mingw}-libqt4
-BuildRequires:  %{mingw}-pthreads-devel
-BuildRequires:  %{mingw}-pthreads
+BuildRequires:  %{mingw}-libwinpthread1
+BuildRequires:  %{mingw}-winpthreads-devel
 BuildRequires:  %{mingw}-libopenssl-devel
 BuildRequires:  %{mingw}-libopenssl
 BuildRequires:  %{mingw}-openssl

diff --git a/platforms/win32/winbareos64.spec b/platforms/win32/winbareos64.spec
@@ -44,8 +44,8 @@ BuildRequires:  %{mingw}-cross-binutils
 BuildRequires:  %{mingw}-cross-pkg-config
 BuildRequires:  %{mingw}-libqt4-devel
 BuildRequires:  %{mingw}-libqt4
-BuildRequires:  %{mingw}-pthreads-devel
-BuildRequires:  %{mingw}-pthreads
+BuildRequires:  %{mingw}-libwinpthread1
+BuildRequires:  %{mingw}-winpthreads-devel
 BuildRequires:  %{mingw}-libopenssl-devel
 BuildRequires:  %{mingw}-libopenssl
 BuildRequires:  %{mingw}-openssl

diff --git a/src/win32/console/Makefile b/src/win32/console/Makefile
@@ -29,7 +29,7 @@ INCLUDES = -I../.. \
 	   -I../vss/include
 LDLIBS = ../lib/libbareos.a \
 	 ../lib/libbareos.dll \
-         $(MINGW_LIB)/libpthreadGCE2.a \
+         $(MINGW_LIB)/libwinpthread.a \
          $(MINGW_LIB)/libz.dll.a \
          $(MINGW_LIB)/libreadline.dll.a \
          $(MINGW_LIB)/libjansson.a \

diff --git a/src/win32/dird/Makefile b/src/win32/dird/Makefile
@@ -31,7 +31,7 @@ LDLIBS = ../lib/libbareos.a \
 	 ../lib/libbareos.dll \
          ../findlib/libbareosfind.dll \
 	 ../cats/libbareoscats.dll \
-         $(MINGW_LIB)/libpthreadGCE2.a \
+         $(MINGW_LIB)/libwinpthread.a \
          $(MINGW_LIB)/libjansson.a \
 	 $(WINSOCKLIB) -lole32 -loleaut32 -luuid -lcomctl32
 

diff --git a/src/win32/filed/Makefile b/src/win32/filed/Makefile
@@ -43,7 +43,7 @@ LDLIBS = ../lib/libbareos.a \
          $(MINGW_LIB)/libz.dll.a \
          $(MINGW_LIB)/liblzo2.dll.a \
          $(MINGW_LIB)/libfastlz.dll.a \
-         $(MINGW_LIB)/libpthreadGCE2.a \
+         $(MINGW_LIB)/libwinpthread.a \
          $(MINGW_LIB)/libjansson.a \
 	 $(WINSOCKLIB) -lole32 -loleaut32 -luuid -lcomctl32
 

diff --git a/src/win32/findlib/Makefile b/src/win32/findlib/Makefile
@@ -28,7 +28,7 @@ INCLUDES = -I../.. \
 	   -I../../findlib \
 	   -I../compat/include
 LDLIBS = ../lib/libbareos.dll \
-	 $(MINGW_LIB)/libpthreadGCE2.a \
+	 $(MINGW_LIB)/libwinpthread.a \
 	 $(WINSOCKLIB)
 
 LIBBAREOSFIND_SRCS = acl.c attribs.c bfile.c create_file.c \

diff --git a/src/win32/findlib/unittests/Makefile b/src/win32/findlib/unittests/Makefile
@@ -30,7 +30,7 @@ INCLUDES = -I../../.. \
 LDLIBS = ../../lib/libbareos.a \
 	      ../../lib/libbareos.dll \
 	      ../../findlib/libbareosfind.dll \
-         $(MINGW_LIB)/libpthreadGCE2.a \
+         $(MINGW_LIB)/libwinpthread.a \
          $(MINGW_LIB)/libz.dll.a \
          $(MINGW_LIB)/libreadline.dll.a \
          $(MINGW_LIB)/libcmocka.dll.a

diff --git a/src/win32/lib/Makefile b/src/win32/lib/Makefile
@@ -28,7 +28,7 @@ INCLUDES = -I../.. \
 	   -I../compat/include
 LDLIBS = $(MINGW_LIB)/libssl.dll.a \
          $(MINGW_LIB)/libcrypto.dll.a \
-         $(MINGW_LIB)/libpthreadGCE2.a \
+         $(MINGW_LIB)/libwinpthread.a \
          $(MINGW_LIB)/libz.dll.a \
          $(MINGW_LIB)/liblzo2.dll.a \
          $(MINGW_LIB)/libfastlz.dll.a \

diff --git a/src/win32/lib/unittests/Makefile b/src/win32/lib/unittests/Makefile
@@ -30,7 +30,7 @@ INCLUDES = -I../../.. \
 			  -I../include
 LDLIBS = ../../lib/libbareos.a \
 	      ../../lib/libbareos.dll \
-         $(MINGW_LIB)/libpthreadGCE2.a \
+         $(MINGW_LIB)/libwinpthread.a \
          $(MINGW_LIB)/libz.dll.a \
          $(MINGW_LIB)/libreadline.dll.a \
          $(MINGW_LIB)/libcmocka.dll.a

diff --git a/src/win32/lmdb/Makefile b/src/win32/lmdb/Makefile
@@ -23,7 +23,7 @@ VPATH = .:../../lmdb
 include ../Makefile.inc
 
 INCLUDES = -I../../lmdb
-LDLIBS = $(MINGW_LIB)/libpthreadGCE2.a \
+LDLIBS = $(MINGW_LIB)/libwinpthread.a \
          -lntdll
 
 LIBBAREOSLMDB_SRCS = mdb.c midl.c

diff --git a/src/win32/plugins/dird/Makefile b/src/win32/plugins/dird/Makefile
@@ -39,7 +39,7 @@ INCLUDES = -I../../.. \
 endif
 PYTHON_INCLUDES = -I../python/include
 LDLIBS = ../../lib/libbareos.dll \
-         $(MINGW_LIB)/libpthreadGCE2.a \
+         $(MINGW_LIB)/libwinpthread.a \
 	 $(MINGW_LIB)/libz.dll.a \
 	 $(MINGW_LIB)/libfastlz.dll.a \
 	 $(WINSOCKLIB) -lole32 -loleaut32 -luuid

diff --git a/src/win32/plugins/filed/Makefile b/src/win32/plugins/filed/Makefile
@@ -31,7 +31,7 @@ INCLUDES = -I../../.. \
 VDI_INCLUDES = -I../../vdi/include
 PYTHON_INCLUDES = -I../python/include
 LDLIBS = ../../lib/libbareos.dll \
-         $(MINGW_LIB)/libpthreadGCE2.a \
+         $(MINGW_LIB)/libwinpthread.a \
          $(MINGW_LIB)/libz.dll.a \
 	 $(WINSOCKLIB) -lole32 -loleaut32 -luuid
 

diff --git a/src/win32/plugins/stored/Makefile b/src/win32/plugins/stored/Makefile
@@ -39,7 +39,7 @@ INCLUDES = -I../../.. \
 endif
 PYTHON_INCLUDES = -I../python/include
 LDLIBS = ../../lib/libbareos.dll \
-         $(MINGW_LIB)/libpthreadGCE2.a \
+         $(MINGW_LIB)/libwinpthread.a \
 	 $(MINGW_LIB)/libz.dll.a \
 	 $(MINGW_LIB)/libfastlz.dll.a \
 	 $(WINSOCKLIB) -lole32 -loleaut32 -luuid

diff --git a/src/win32/stored/Makefile b/src/win32/stored/Makefile
@@ -31,14 +31,14 @@ INCLUDES = -I. \
 	   -I../compat/include
 LDLIBS = ../lib/libbareos.a \
 	 ../lib/libbareos.dll \
-         $(MINGW_LIB)/libpthreadGCE2.a \
+         $(MINGW_LIB)/libwinpthread.a \
          $(MINGW_LIB)/libjansson.a \
 	 $(WINSOCKLIB) -lole32 -loleaut32 -luuid -lcomctl32
 
 LDLIBS_FIND = ../lib/libbareos.a \
 	      ../lib/libbareos.dll \
 	      ../findlib/libbareosfind.dll \
-	      $(MINGW_LIB)/libpthreadGCE2.a \
+	      $(MINGW_LIB)/libwinpthread.a \
 	      $(MINGW_LIB)/libjansson.a \
 	      $(WINSOCKLIB) -lole32 -loleaut32 -luuid -lcomctl32
 

diff --git a/src/win32/tests/Makefile b/src/win32/tests/Makefile
@@ -29,7 +29,7 @@ INCLUDES = -I../.. \
 	   -I../vss/include
 LDLIBS = ../lib/libbareos.a \
 	 ../lib/libbareos.dll \
-         $(MINGW_LIB)/libpthreadGCE2.a \
+         $(MINGW_LIB)/libwinpthread.a \
          $(MINGW_LIB)/libz.dll.a \
          $(MINGW_LIB)/libreadline.dll.a \
 	 $(WINSOCKLIB) -lole32 -loleaut32 -luuid

diff --git a/src/win32/tools/Makefile b/src/win32/tools/Makefile
@@ -29,7 +29,7 @@ INCLUDES = -I../.. \
 	   -I../vss/include
 LDLIBS = ../lib/libbareos.a \
 	 ../lib/libbareos.dll \
-         $(MINGW_LIB)/libpthreadGCE2.a \
+         $(MINGW_LIB)/libwinpthread.a \
          $(MINGW_LIB)/libz.dll.a \
 	 $(WINSOCKLIB) -lole32 -loleaut32 -luuid