Skip to content

Commit

Permalink
Remove dependency on openspecfun
Browse files Browse the repository at this point in the history
  • Loading branch information
ararslan committed Feb 3, 2017
1 parent c3ac805 commit 52d5faa
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 61 deletions.
2 changes: 0 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ their own licenses:
- [ARPACK](http://www.caam.rice.edu/software/ARPACK/RiceBSD.txt#LICENSE) [BSD-3]
- [DSFMT](http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/LICENSE.txt) [BSD-3]
- [OPENLIBM](https://github.com/JuliaLang/openlibm/blob/master/LICENSE.md) [MIT, BSD-2, ISC]
- [OPENSPECFUN](https://github.com/JuliaLang/openspecfun) [MIT, public domain]
- [FADDEEVA](http://ab-initio.mit.edu/Faddeeva) [MIT]
- [FFTW](http://fftw.org/doc/License-and-Copyright.html) [GPL2+]
- [GMP](http://gmplib.org/manual/Copying.html#Copying) [LGPL3+ or GPL2+]
- [LIBGIT2](https://github.com/libgit2/libgit2/blob/development/COPYING) [GPL2+ with unlimited linking exception]
Expand Down
1 change: 0 additions & 1 deletion Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ USE_SYSTEM_PCRE:=0
USE_SYSTEM_LIBM:=0
USE_SYSTEM_OPENLIBM:=0
UNTRUSTED_SYSTEM_LIBM:=0
USE_SYSTEM_OPENSPECFUN:=0
USE_SYSTEM_DSFMT:=0
USE_SYSTEM_BLAS:=0
USE_SYSTEM_LAPACK:=0
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,6 @@ ifeq ($(USE_SYSTEM_LIBM),0)
JL_PRIVATE_LIBS += openlibm
endif
endif
ifeq ($(USE_SYSTEM_OPENSPECFUN),0)
JL_PRIVATE_LIBS += openspecfun
endif
ifeq ($(USE_SYSTEM_DSFMT),0)
JL_PRIVATE_LIBS += dSFMT
endif
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,6 @@ Julia uses the following external libraries, which are automatically downloaded
- **[FemtoLisp]** — packaged with Julia source, and used to implement the compiler front-end.
- **[libuv]** — portable, high-performance event-based I/O library
- **[OpenLibm]** — portable libm library containing elementary math functions.
- **[OpenSpecFun]** (>= 0.4) — library containing Bessel and error functions of complex arguments.
- **[DSFMT]** — fast Mersenne Twister pseudorandom number generator library.
- **[OpenBLAS]** — fast, open, and maintained [basic linear algebra subprograms (BLAS)](https://en.wikipedia.org/wiki/Basic_Linear_Algebra_Subprograms) library, based on [Kazushige Goto's](https://en.wikipedia.org/wiki/Kazushige_Goto) famous [GotoBLAS](https://www.tacc.utexas.edu/research-development/tacc-software/gotoblas2).
- **[LAPACK]** (>= 3.5) — library of linear algebra routines for solving systems of simultaneous linear equations, least-squares solutions of linear systems of equations, eigenvalue problems, and singular value problems.
Expand Down Expand Up @@ -310,7 +309,6 @@ Julia uses the following external libraries, which are automatically downloaded
[perl]: http://www.perl.org
[cmake]: http://www.cmake.org
[OpenLibm]: https://github.com/JuliaLang/openlibm
[OpenSpecFun]: https://github.com/JuliaLang/openspecfun
[DSFMT]: http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/#dSFMT
[OpenBLAS]: https://github.com/xianyi/OpenBLAS
[LAPACK]: http://www.netlib.org/lapack
Expand Down
6 changes: 3 additions & 3 deletions contrib/fixup-libgfortran.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ find_shlib ()
}

# First, discover all the places where libgfortran/libgcc is, as well as their true SONAMES
for lib in arpack openlibm openspecfun lapack; do
for lib in arpack openlibm lapack; do
if [ -f "$private_libdir/lib$lib.$SHLIB_EXT" ]; then
LIBGFORTRAN_DIRS="$LIBGFORTRAN_DIRS $(dirname $(find_shlib $lib libgfortran) 2>/dev/null)"
LIBGFORTRAN_DIRS="$LIBGFORTRAN_DIRS $(dirname $(find_shlib $lib libgcc_s) 2>/dev/null)"
Expand Down Expand Up @@ -83,7 +83,7 @@ echo "Found traces of libgfortran/libgcc in $LIBGFORTRAN_DIRS"
# Do the private_libdir libraries
if [ "$UNAME" = "Darwin" ]; then
cd $private_libdir
for file in openlibm quadmath.0 gfortran.3 openblas arpack lapack openspecfun; do
for file in openlibm quadmath.0 gfortran.3 openblas arpack lapack; do
for dylib in $(ls lib$file*.dylib* 2>/dev/null); do
for dir in $LIBGFORTRAN_DIRS; do
install_name_tool -change "$dir/libgfortran.3.dylib" @rpath/libgfortran.3.dylib $dylib
Expand All @@ -96,7 +96,7 @@ fi

if [ "$UNAME" = "Linux" ]; then
cd $private_libdir
for file in openlibm quadmath gfortran openblas arpack lapack openspecfun; do
for file in openlibm quadmath gfortran openblas arpack lapack; do
for dylib in $(ls lib$file*.so* 2>/dev/null); do
patchelf --set-rpath \$ORIGIN $dylib
done
Expand Down
2 changes: 1 addition & 1 deletion contrib/windows/msys_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ if ! [ -e usr/bin/busybox.exe ]; then
fi

for lib in SUITESPARSE ARPACK BLAS LAPACK FFTW \
GMP MPFR PCRE LIBUNWIND OPENSPECFUN; do
GMP MPFR PCRE LIBUNWIND; do
echo "USE_SYSTEM_$lib = 1" >> Make.user
done
echo 'override LIBLAPACK = $(LIBBLAS)' >> Make.user
Expand Down
9 changes: 2 additions & 7 deletions deps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ include $(SRCDIR)/tools/git-external.mk
# custom Makefile rules: openlibm dsfmt suitesparse-wrapper suitesparse lapack openblas utf8proc objconv osxunwind
# CMake libs: libgit2 libssh2 mbedtls
#
# downloaded from git: llvm-svn, libuv, libopenlibm, utf8proc, openspecfun, libgit2, libssh2
# downloaded from git: llvm-svn, libuv, libopenlibm, utf8proc, libgit2, libssh2
#
# there are rules in this file with the . replaced by a %
# this is some magic Makefile trick that tells make
Expand Down Expand Up @@ -76,10 +76,6 @@ DEP_LIBS += openlibm
endif
endif

ifeq ($(USE_SYSTEM_OPENSPECFUN), 0)
DEP_LIBS += openspecfun
endif

ifeq ($(USE_SYSTEM_DSFMT), 0)
DEP_LIBS += dsfmt
endif
Expand Down Expand Up @@ -175,13 +171,12 @@ uninstall: $(addprefix uninstall-, $(DEP_LIBS_STAGED))
cleanall: $(addprefix clean-, $(DEP_LIBS))
distcleanall: $(addprefix distclean-, $(DEP_LIBS))
rm -rf $(build_prefix)
getall: get-llvm get-libuv get-pcre get-openlibm get-openspecfun get-dsfmt get-openblas get-lapack get-fftw get-suitesparse get-arpack get-unwind get-osxunwind get-gmp get-mpfr get-patchelf get-utf8proc get-objconv get-mbedtls get-libssh2 get-curl get-libgit2
getall: get-llvm get-libuv get-pcre get-openlibm get-dsfmt get-openblas get-lapack get-fftw get-suitesparse get-arpack get-unwind get-osxunwind get-gmp get-mpfr get-patchelf get-utf8proc get-objconv get-mbedtls get-libssh2 get-curl get-libgit2

include $(SRCDIR)/llvm.mk
include $(SRCDIR)/libuv.mk
include $(SRCDIR)/pcre.mk
include $(SRCDIR)/openlibm.mk
include $(SRCDIR)/openspecfun.mk
include $(SRCDIR)/dsfmt.mk
include $(SRCDIR)/objconv.mk
include $(SRCDIR)/blas.mk
Expand Down
40 changes: 0 additions & 40 deletions deps/openspecfun.mk

This file was deleted.

2 changes: 0 additions & 2 deletions deps/openspecfun.version

This file was deleted.

0 comments on commit 52d5faa

Please sign in to comment.