File tree 5 files changed +6
-19
lines changed
5 files changed +6
-19
lines changed Original file line number Diff line number Diff line change @@ -79,7 +79,6 @@ Julia's build process uses the following external tools:
79
79
Julia bundles the following external programs and libraries on some platforms:
80
80
81
81
- [ 7-Zip] ( http://www.7-zip.org/license.txt )
82
- - [ BUSYBOX] ( https://github.com/rmyorston/busybox-w32/blob/master/LICENSE )
83
82
- [ ZLIB] ( http://zlib.net/zlib_license.html )
84
83
- [ LIBEXPAT] ( http://expat.cvs.sourceforge.net/viewvc/expat/expat/README )
85
84
Original file line number Diff line number Diff line change @@ -483,10 +483,6 @@ endif
483
483
ifeq ($(OS ) , WINNT)
484
484
[ ! -d $(JULIAHOME)/dist-extras ] || ( cd $(JULIAHOME)/dist-extras && \
485
485
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
490
486
cd $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin && rm -f llvm* llc.exe lli.exe opt.exe LTO.dll bugpoint.exe macho-dump.exe
491
487
492
488
# create file listing for uninstall. note: must have Windows path separators and line endings.
@@ -639,11 +635,6 @@ endif
639
635
chmod a+x 7z.dll && \
640
636
$(call spawn,./7z.exe) x -y -onsis nsis-2.46.5-Unicode-setup.exe && \
641
637
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
647
638
648
639
# various statistics about the build that may interest the user
649
640
ifeq ($(USE_SYSTEM_LLVM ) , 1)
Original file line number Diff line number Diff line change 41
41
- C:\cygdownloads
42
42
- llvm-3.9.1-i686-w64-mingw32-juliadeps-r07.7z
43
43
- llvm-3.9.1-x86_64-w64-mingw32-juliadeps-r07.7z
44
- - usr/bin/busybox.exe
45
44
- C:\ccache
46
45
47
46
build_script :
Original file line number Diff line number Diff line change @@ -165,12 +165,6 @@ if [ -z "`which make 2>/dev/null`" ]; then
165
165
export PATH=$PWD /bin:$PATH
166
166
fi
167
167
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
174
168
175
169
for lib in SUITESPARSE ARPACK BLAS LAPACK \
176
170
GMP MPFR PCRE LIBUNWIND; do
@@ -218,6 +212,5 @@ cat Make.user
218
212
make -j3 VERBOSE=1 release
219
213
make -j3 VERBOSE=1 install
220
214
make VERBOSE=1 JULIA=../../usr/bin/julia.exe BIN=. " $( make print-CC) " -C test/embedding release
221
- cp usr/bin/busybox.exe julia-* /bin
222
215
make build-stats
223
216
ccache -s
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ sleepcmd = `sleep`
20
20
lscmd = ` ls`
21
21
havebb = false
22
22
if Sys. iswindows ()
23
- busybox = joinpath (Sys . BINDIR, " busybox.exe" )
23
+ busybox = download ( " http://frippery.org/files/busybox/busybox.exe " , joinpath ( tempdir (), " busybox.exe" ) )
24
24
havebb = try # use busybox-w32 on windows, if available
25
25
success (` $busybox ` )
26
26
true
@@ -618,3 +618,8 @@ open(`$catcmd`, "r+") do f
618
618
@test read (f, Char) == ' δ'
619
619
wait (t)
620
620
end
621
+
622
+ # clean up busybox download
623
+ if Sys. iswindows ()
624
+ rm (busybox, force= true )
625
+ end
You can’t perform that action at this time.
0 commit comments