Update libxml to 2.9.8 for Windows binaries

[wimlib] / tools / windeps / Makefile

diff --git a/tools/windeps/Makefile b/tools/windeps/Makefile
index 5b7dde52187f48a8aa62652653aa07c43ded3dc1..5f25878f0ac5b42736672bc75283a30f7e6b839b 100644 (file)
--- a/tools/windeps/Makefile
+++ b/tools/windeps/Makefile
@@ -10,13 +10,11 @@
 #
 
 ARCHITECTURES          := i686 x86_64
-LIBXML2_VERSION                := 2.9.4
-WINPTHREADS_VERSION    := 4.0.4
-WINICONV_VERSION       := 0.0.6
+LIBXML2_VERSION                := 2.9.8
+WINPTHREADS_VERSION    := 5.0.3
 
 LIBXML_URL             := ftp://xmlsoft.org/libxml2/libxml2-$(LIBXML2_VERSION).tar.gz
 WINPTHREADS_URL                := http://downloads.sourceforge.net/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$(WINPTHREADS_VERSION).tar.bz2
-WINICONV_URL           := https://github.com/win-iconv/win-iconv/archive/$(WINICONV_VERSION).tar.gz
 
 
 LIBXML_SRCDIR          := libxml2-$(LIBXML2_VERSION)
@@ -42,17 +40,6 @@ $(WINPTHREADS_SRCDIR):$(WINPTHREADS_DIST) checksums_verified
        cp $@/COPYING COPYING.winpthreads
 MAKE_CLEAN_FILES += $(WINPTHREADS_SRCDIR) mingw-w64-v$(WINPTHREADS_VERSION) COPYING.winpthreads
 
-WINICONV_SRCDIR                := win-iconv-$(WINICONV_VERSION)
-WINICONV_DIST          := $(WINICONV_VERSION).tar.gz
-SRCDIR_TARGETS         += $(WINICONV_SRCDIR)
-DIST_TARGETS           += $(WINICONV_DIST)
-$(WINICONV_DIST):
-       wget $(WINICONV_URL)
-$(WINICONV_SRCDIR):$(WINICONV_DIST) checksums_verified
-       tar xvf $<
-# win-iconv is public domain, so there's no license file.
-MAKE_CLEAN_FILES       += $(WINICONV_SRCDIR)
-
 checksums_verified:$(DIST_TARGETS)
        sha256sum -c sha256sums
 
@@ -98,41 +85,20 @@ 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/'               \
+              -e 's/pthread_getevent ()/pthread_getevent (void)/'\
+               ../sysroot_$(1)/include/pthread.h;
 
 $(1)_BUILD_TARGETS += winpthreads_$(1)
 MAKE_CLEAN_FILES += build_winpthreads_$(1)
 endef
 
-#
-# declare_winiconv_target(arch)
-#
-define declare_winiconv_target
-winiconv_$(1):$(WINICONV_SRCDIR)
-       builddir=build_winiconv_$(1);                           \
-       rm -rf $$$$builddir;                                    \
-       cp -r $(WINICONV_SRCDIR) $$$$builddir;                  \
-       cd $$$$builddir;                                        \
-       $(MAKE) CC=$(1)-w64-mingw32-gcc                         \
-               AR=$(1)-w64-mingw32-ar                          \
-               RANLIB=$(1)-w64-mingw32-ranlib                  \
-               DLLTOOL=$(1)-w64-mingw32-dlltool                \
-               CFLAGS=-O2                                      \
-               prefix=$$$$PWD/../sysroot_$(1)                  \
-               install;                                        \
-       rm -f ../sysroot_$(1)/lib/libiconv.dll.a;
-
-$(1)_BUILD_TARGETS += winiconv_$(1)
-MAKE_CLEAN_FILES += build_winiconv_$(1)
-endef
-
 #
 # declare_arch_targets(arch)
 #
 define declare_arch_targets
 $(eval $(call declare_libxml_target,$(1)))
 $(eval $(call declare_winpthreads_target,$(1)))
-$(eval $(call declare_winiconv_target,$(1)))
 
 sysroot_$(1): $($(1)_BUILD_TARGETS)