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.
This commit is contained in:
parent
7dc477a4fc
commit
54e596894f
3 changed files with 5 additions and 1 deletions
|
@ -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
|
||||
|
|
|
@ -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 <id@joeyh.name> Tue, 24 Oct 2017 13:12:52 -0400
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue