Update winpthreads in Windows binaries to 10.0.0

[wimlib] / tools / windeps / Makefile

diff --git a/tools/windeps/Makefile b/tools/windeps/Makefile
index 4f6401fc242b937c4bff17000d68932485d8d041..732e3174dc2a096a3b95244f507e6acef8144eef 100644 (file)
--- a/tools/windeps/Makefile
+++ b/tools/windeps/Makefile
@@ -10,22 +10,22 @@
 #
 
 ARCHITECTURES          := i686 x86_64
-LIBXML2_VERSION                := 2.9.4
-WINPTHREADS_VERSION    := 4.0.4
+LIBXML2_VERSION                := 2.10.3
+WINPTHREADS_VERSION    := 10.0.0
 
-LIBXML_URL             := ftp://xmlsoft.org/libxml2/libxml2-$(LIBXML2_VERSION).tar.gz
+LIBXML_URL             := https://download.gnome.org/sources/libxml2/2.10/libxml2-$(LIBXML2_VERSION).tar.xz
 WINPTHREADS_URL                := http://downloads.sourceforge.net/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$(WINPTHREADS_VERSION).tar.bz2
 
 
 LIBXML_SRCDIR          := libxml2-$(LIBXML2_VERSION)
-LIBXML_DIST            := $(LIBXML_SRCDIR).tar.gz
+LIBXML_DIST            := $(LIBXML_SRCDIR).tar.xz
 SRCDIR_TARGETS         += $(LIBXML_SRCDIR)
 DIST_TARGETS           += $(LIBXML_DIST)
 $(LIBXML_DIST):
        wget $(LIBXML_URL)
 $(LIBXML_SRCDIR):$(LIBXML_DIST) checksums_verified
        tar xvf $<
-       cp $@/COPYING COPYING.libxml2
+       cp $@/Copyright COPYING.libxml2
 MAKE_CLEAN_FILES += $(LIBXML_SRCDIR) COPYING.libxml2
 
 WINPTHREADS_DIST       := mingw-w64-v$(WINPTHREADS_VERSION).tar.bz2
@@ -85,7 +85,8 @@ winpthreads_$(1):$(WINPTHREADS_SRCDIR)
                --prefix=$$$$PWD/../sysroot_$(1)                \
                CFLAGS=-O2;                                     \
        $(MAKE) install;                                        \
-       sed -i 's/if defined DLL_EXPORT/if 0/' ../sysroot_$(1)/include/pthread.h;
+       sed -i -e 's/if defined DLL_EXPORT/if 0/'               \
+               ../sysroot_$(1)/include/pthread.h;
 
 $(1)_BUILD_TARGETS += winpthreads_$(1)
 MAKE_CLEAN_FILES += build_winpthreads_$(1)