Skip to content

Commit a646c26

Browse files
musmStefanKarpinski
authored andcommitted
Don't bundle busybox with Windows (#30022)
1 parent 7125a7f commit a646c26

File tree

5 files changed

+6
-19
lines changed

5 files changed

+6
-19
lines changed

LICENSE.md

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ Julia's build process uses the following external tools:
7979
Julia bundles the following external programs and libraries on some platforms:
8080

8181
- [7-Zip](http://www.7-zip.org/license.txt)
82-
- [BUSYBOX](https://github.com/rmyorston/busybox-w32/blob/master/LICENSE)
8382
- [ZLIB](http://zlib.net/zlib_license.html)
8483
- [LIBEXPAT](http://expat.cvs.sourceforge.net/viewvc/expat/expat/README)
8584

Makefile

-9
Original file line numberDiff line numberDiff line change
@@ -483,10 +483,6 @@ endif
483483
ifeq ($(OS), WINNT)
484484
[ ! -d $(JULIAHOME)/dist-extras ] || ( cd $(JULIAHOME)/dist-extras && \
485485
cp 7z.exe 7z.dll libexpat-1.dll zlib1.dll $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin )
486-
ifeq ($(USE_GPL_LIBS), 1)
487-
[ ! -d $(JULIAHOME)/dist-extras ] || ( cd $(JULIAHOME)/dist-extras && \
488-
cp busybox.exe $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin )
489-
endif
490486
cd $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin && rm -f llvm* llc.exe lli.exe opt.exe LTO.dll bugpoint.exe macho-dump.exe
491487

492488
# create file listing for uninstall. note: must have Windows path separators and line endings.
@@ -639,11 +635,6 @@ endif
639635
chmod a+x 7z.dll && \
640636
$(call spawn,./7z.exe) x -y -onsis nsis-2.46.5-Unicode-setup.exe && \
641637
chmod a+x ./nsis/makensis.exe
642-
ifeq ($(USE_GPL_LIBS), 1)
643-
cd $(JULIAHOME)/dist-extras && \
644-
$(JLDOWNLOAD) busybox.exe http://frippery.org/files/busybox/busybox-w32-FRP-875-gc6ec14a.exe && \
645-
chmod a+x busybox.exe
646-
endif
647638

648639
# various statistics about the build that may interest the user
649640
ifeq ($(USE_SYSTEM_LLVM), 1)

appveyor.yml

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ cache:
4141
- C:\cygdownloads
4242
- llvm-3.9.1-i686-w64-mingw32-juliadeps-r07.7z
4343
- llvm-3.9.1-x86_64-w64-mingw32-juliadeps-r07.7z
44-
- usr/bin/busybox.exe
4544
- C:\ccache
4645

4746
build_script:

contrib/windows/appveyor_build.sh

-7
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,6 @@ if [ -z "`which make 2>/dev/null`" ]; then
165165
export PATH=$PWD/bin:$PATH
166166
fi
167167

168-
if ! [ -e usr/bin/busybox.exe ]; then
169-
f=busybox-w32-FRP-875-gc6ec14a.exe
170-
echo "Downloading $f"
171-
$curlflags -o usr/bin/busybox.exe http://frippery.org/files/busybox/$f
172-
fi
173-
chmod -R +x usr/bin usr/tools
174168

175169
for lib in SUITESPARSE ARPACK BLAS LAPACK \
176170
GMP MPFR PCRE LIBUNWIND; do
@@ -218,6 +212,5 @@ cat Make.user
218212
make -j3 VERBOSE=1 release
219213
make -j3 VERBOSE=1 install
220214
make VERBOSE=1 JULIA=../../usr/bin/julia.exe BIN=. "$(make print-CC)" -C test/embedding release
221-
cp usr/bin/busybox.exe julia-*/bin
222215
make build-stats
223216
ccache -s

test/spawn.jl

+6-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ sleepcmd = `sleep`
2020
lscmd = `ls`
2121
havebb = false
2222
if Sys.iswindows()
23-
busybox = joinpath(Sys.BINDIR, "busybox.exe")
23+
busybox = download("http://frippery.org/files/busybox/busybox.exe", joinpath(tempdir(), "busybox.exe"))
2424
havebb = try # use busybox-w32 on windows, if available
2525
success(`$busybox`)
2626
true
@@ -618,3 +618,8 @@ open(`$catcmd`, "r+") do f
618618
@test read(f, Char) == 'δ'
619619
wait(t)
620620
end
621+
622+
# clean up busybox download
623+
if Sys.iswindows()
624+
rm(busybox, force=true)
625+
end

0 commit comments

Comments
 (0)