Skip to content

Commit

Permalink
Reinstate downloading of busybox-w32 in make win-extras
Browse files Browse the repository at this point in the history
We may want to make this conditional on USE_GPL_LIBS, though since
we're only running it as a command line executable and not linking
to it, it probably falls under the aggregation clause
  • Loading branch information
tkelman committed Jul 13, 2016
1 parent c8e090c commit 68d991d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ Julia's build process uses the following external tools:
Julia bundles the following external programs and libraries on some platforms:

- [7-Zip](https://www.7-zip.org/license.txt)
- [BUSYBOX](https://github.com/rmyorston/busybox-w32/blob/master/LICENSE)
- [ZLIB](https://zlib.net/zlib_license.html)
- [LIBEXPAT](https://expat.cvs.sourceforge.net/viewvc/expat/expat/README)
- [OPENSSL](https://github.com/openssl/openssl/blob/master/LICENSE)
Expand Down
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ endif

ifeq ($(OS), WINNT)
[ ! -d $(JULIAHOME)/dist-extras ] || ( cd $(JULIAHOME)/dist-extras && \
cp 7z.exe 7z.dll libexpat-1.dll zlib1.dll libgfortran-3.dll libquadmath-0.dll libstdc++-6.dll libgcc_s_s*-1.dll libssp-0.dll $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin )
cp 7z.exe 7z.dll busybox.exe libexpat-1.dll zlib1.dll libgfortran-3.dll libquadmath-0.dll libstdc++-6.dll libgcc_s_s*-1.dll libssp-0.dll $(BUILDROOT)/julia-$(JULIA_COMMIT)/bin )
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.
Expand Down Expand Up @@ -618,10 +618,12 @@ endif
cd $(JULIAHOME)/dist-extras && \
$(JLDOWNLOAD) https://downloads.sourceforge.net/sevenzip/7z920_extra.7z && \
$(JLDOWNLOAD) https://unsis.googlecode.com/files/nsis-2.46.5-Unicode-setup.exe && \
$(JLDOWNLOAD) busybox.exe https://frippery.org/files/busybox/busybox-w32-FRP-483-g31277ab.exe && \
chmod a+x 7z.exe && \
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
chmod a+x ./nsis/makensis.exe && \
chmod a+x busybox.exe

# various statistics about the build that may interest the user
ifeq ($(USE_SYSTEM_LLVM), 1)
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ cache:
- x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z
- llvm-3.7.1-i686-w64-mingw32-juliadeps-r09.7z
- llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z
- usr/bin/busybox.exe

build_script:
# If there's a newer build queued for the same PR, cancel this one
Expand Down
4 changes: 4 additions & 0 deletions contrib/windows/msys_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ if [ -z "`which make 2>/dev/null`" ]; then
export PATH=$PWD/bin:$PATH
fi

f=busybox-w32-FRP-483-g31277ab.exe
echo "Downloading $f"
$curlflags -o usr/bin/busybox.exe https://frippery.org/files/busybox/$f

for lib in SUITESPARSE ARPACK BLAS LAPACK FFTW \
GMP MPFR PCRE LIBUNWIND OPENSPECFUN; do
echo "USE_SYSTEM_$lib = 1" >> Make.user
Expand Down

0 comments on commit 68d991d

Please sign in to comment.