From c90d07d0dd37e3631bf70bd01e68c7f818215a97 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 25 Oct 2017 13:51:31 -0400 Subject: Windows: Remove wget from bundle; it needs libraries that are not included, and git for windows includes curl which git-annex will use instead. wget was broken even in the previous old release of the windows bundle, this is not new breakage. msys-idn-11.dll and probably more would be needed to use it. git for windows includes msys-idn2-0.dll instead. --- Build/BundledPrograms.hs | 2 ++ CHANGELOG | 3 +++ standalone/windows/build.sh | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs index 271e1dd98..9e590bcf1 100644 --- a/Build/BundledPrograms.hs +++ b/Build/BundledPrograms.hs @@ -70,11 +70,13 @@ preferredBundledPrograms = catMaybes #ifndef mingw32_HOST_OS , Just "sh" #endif +#ifndef mingw32_HOST_OS #ifndef darwin_HOST_OS -- wget on OSX has been problematic, looking for certs in the wrong -- places. Don't ship it, use curl or the OSX's own wget if it has -- one. , ifset SysConfig.wget "wget" +#endif #endif , SysConfig.lsof , SysConfig.gcrypt diff --git a/CHANGELOG b/CHANGELOG index 612f65515..e9803b14f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,9 @@ git-annex (6.20171019) UNRELEASED; urgency=medium * Code for terminating processes on Windows is not linking anymore; made a warning be displayed instead. This breaks restarting the assistant and git annex assistant --stop. + * Windows: Remove wget from bundle; it needs libraries that are not + included, and git for windows includes curl which git-annex will use + instead. -- Joey Hess Tue, 24 Oct 2017 13:12:52 -0400 diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index b209d2d9b..037351075 100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -53,7 +53,6 @@ getextra () { fi } getextra rsync.exe 85cb7a4d16d274fcf8069b39042965ad26abd6aa -getextra wget.exe 044380729200d5762965b10123a4f134806b01cf # Deps are not built with cygwin environment, because we don't want # configure scripts for haskell libraries to link them with the cygwin -- cgit v1.2.3