From 02a44d421b039c18d19da6f54aa8e17067d88cab Mon Sep 17 00:00:00 2001
From: Mus <mus-m@outlook.com>
Date: Tue, 20 Nov 2018 16:48:24 -0500
Subject: [PATCH] Don't bundle busybox with Windows (#30022)

---
 LICENSE.md                        | 1 -
 Makefile                          | 9 ---------
 appveyor.yml                      | 1 -
 contrib/windows/appveyor_build.sh | 7 -------
 test/spawn.jl                     | 7 ++++++-
 5 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index f4a62dcfcbad9..f565217ae3926 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -79,7 +79,6 @@ Julia's build process uses the following external tools:
 Julia bundles the following external programs and libraries on some platforms:
 
 - [7-Zip](http://www.7-zip.org/license.txt)
-- [BUSYBOX](https://github.com/rmyorston/busybox-w32/blob/master/LICENSE)
 - [ZLIB](http://zlib.net/zlib_license.html)
 - [LIBEXPAT](http://expat.cvs.sourceforge.net/viewvc/expat/expat/README)
 
diff --git a/Makefile b/Makefile
index 18a406dd22d8b..6debfbfd98a8a 100644
--- a/Makefile
+++ b/Makefile
@@ -483,10 +483,6 @@ endif
 ifeq ($(OS), WINNT)
 	[ ! -d $(JULIAHOME)/dist-extras ] || ( cd $(JULIAHOME)/dist-extras && \
 		cp 7z.exe 7z.dll libexpat-1.dll zlib1.dll $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin )
-ifeq ($(USE_GPL_LIBS), 1)
-	[ ! -d $(JULIAHOME)/dist-extras ] || ( cd $(JULIAHOME)/dist-extras && \
-		cp busybox.exe $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin )
-endif
 	cd $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin && rm -f llvm* llc.exe lli.exe opt.exe LTO.dll bugpoint.exe macho-dump.exe
 
 	# create file listing for uninstall. note: must have Windows path separators and line endings.
@@ -639,11 +635,6 @@ endif
 	chmod a+x 7z.dll && \
 	$(call spawn,./7z.exe) x -y -onsis nsis-2.46.5-Unicode-setup.exe && \
 	chmod a+x ./nsis/makensis.exe
-ifeq ($(USE_GPL_LIBS), 1)
-	cd $(JULIAHOME)/dist-extras && \
-	$(JLDOWNLOAD) busybox.exe http://frippery.org/files/busybox/busybox-w32-FRP-875-gc6ec14a.exe && \
-	chmod a+x busybox.exe
-endif
 
 # various statistics about the build that may interest the user
 ifeq ($(USE_SYSTEM_LLVM), 1)
diff --git a/appveyor.yml b/appveyor.yml
index 7894b226de2db..6f0ca2d04c40a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -41,7 +41,6 @@ cache:
   - C:\cygdownloads
   - llvm-3.9.1-i686-w64-mingw32-juliadeps-r07.7z
   - llvm-3.9.1-x86_64-w64-mingw32-juliadeps-r07.7z
-  - usr/bin/busybox.exe
   - C:\ccache
 
 build_script:
diff --git a/contrib/windows/appveyor_build.sh b/contrib/windows/appveyor_build.sh
index 0984643aa88af..fa29774a4e63b 100755
--- a/contrib/windows/appveyor_build.sh
+++ b/contrib/windows/appveyor_build.sh
@@ -165,12 +165,6 @@ if [ -z "`which make 2>/dev/null`" ]; then
   export PATH=$PWD/bin:$PATH
 fi
 
-if ! [ -e usr/bin/busybox.exe ]; then
-  f=busybox-w32-FRP-875-gc6ec14a.exe
-  echo "Downloading $f"
-  $curlflags -o usr/bin/busybox.exe http://frippery.org/files/busybox/$f
-fi
-chmod -R +x usr/bin usr/tools
 
 for lib in SUITESPARSE ARPACK BLAS LAPACK \
     GMP MPFR PCRE LIBUNWIND; do
@@ -218,6 +212,5 @@ cat Make.user
 make -j3 VERBOSE=1 release
 make -j3 VERBOSE=1 install
 make VERBOSE=1 JULIA=../../usr/bin/julia.exe BIN=. "$(make print-CC)" -C test/embedding release
-cp usr/bin/busybox.exe julia-*/bin
 make build-stats
 ccache -s
diff --git a/test/spawn.jl b/test/spawn.jl
index 9ebdcdef3a505..0cfc23a8a02df 100644
--- a/test/spawn.jl
+++ b/test/spawn.jl
@@ -20,7 +20,7 @@ sleepcmd = `sleep`
 lscmd = `ls`
 havebb = false
 if Sys.iswindows()
-    busybox = joinpath(Sys.BINDIR, "busybox.exe")
+    busybox = download("http://frippery.org/files/busybox/busybox.exe", joinpath(tempdir(), "busybox.exe"))
     havebb = try # use busybox-w32 on windows, if available
         success(`$busybox`)
         true
@@ -618,3 +618,8 @@ open(`$catcmd`, "r+") do f
     @test read(f, Char) == 'δ'
     wait(t)
 end
+
+# clean up busybox download
+if Sys.iswindows()
+    rm(busybox, force=true)
+end