Permalink
Browse files

Remove traces of nginx, lighttpd, clp, glpk, etc. from the build.

  • Loading branch information...
1 parent be51ffd commit 0303fa127576e485e44976c5b4b116031a56b1b2 @ViralBShah ViralBShah committed Mar 20, 2013
Showing with 3 additions and 8 deletions.
  1. +1 −1 .travis.yml
  2. +0 −3 Make.inc
  3. +2 −2 deps/Makefile
  4. +0 −2 deps/Versions.make
View
@@ -5,7 +5,7 @@ compiler:
notifications:
email: false
before_install:
- - BUILDOPTS="LLVM_CONFIG=llvm-config-3.2 USE_QUIET=0 USE_LIB64=0"; for lib in LLVM ZLIB SUITESPARSE ARPACK BLAS FFTW LAPACK GMP LIBUNWIND READLINE GLPK NGINX; do export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1"; done
+ - BUILDOPTS="LLVM_CONFIG=llvm-config-3.2 USE_QUIET=0 USE_LIB64=0"; for lib in LLVM ZLIB SUITESPARSE ARPACK BLAS FFTW LAPACK GMP LIBUNWIND READLINE; do export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1"; done
- sudo apt-get update -qq -y
- sudo apt-get install zlib1g-dev
- sudo add-apt-repository ppa:staticfloat/julia-deps -y
View
@@ -151,7 +151,6 @@ OPENBLAS_TARGET_ARCH=
# Use libraries available on the system instead of building them
USE_SYSTEM_LLVM=0
-USE_SYSTEM_LIGHTTPD=0
USE_SYSTEM_LIBUNWIND=0
USE_SYSTEM_READLINE=0
USE_SYSTEM_PCRE=0
@@ -162,8 +161,6 @@ USE_SYSTEM_FFTW=0
USE_SYSTEM_GMP=0
USE_SYSTEM_ARPACK=0
USE_SYSTEM_SUITESPARSE=0
-USE_SYSTEM_LIGHTTPD=0
-USE_SYSTEM_NGINX=0
USE_SYSTEM_ZLIB=0
ifeq (exists, $(shell [ -e $(JULIAHOME)/Make.user ] && echo exists ))
View
@@ -19,7 +19,7 @@ CONFIGURE_COMMON += --host=$(XC_HOST) --build=$(CONFIG_GUESS)
endif
#autoconf configure-driven scripts: llvm readline pcre arpack fftw unwind gmp patchelf
-#custom configure-driven script: zlib nginx
+#custom configure-driven script: zlib
#custom Makefile rules: openlibm Rmath double-conversion random suitesparse-wrapper suitesparse lapack openblas uv
# prevent installing libs into usr/lib64 on opensuse
@@ -114,7 +114,7 @@ install: $(addprefix install-, $(LIBS))
cleanall: $(addprefix clean-, $(LIBS))
distclean: $(addprefix distclean-, $(LIBS))
rm -rf $(BUILD)
-getall: get-llvm get-readline get-uv get-pcre get-double-conversion get-openlibm get-random get-openblas get-fftw get-suitesparse get-clp get-unwind get-nginx get-gmp get-zlib get-patchelf
+getall: get-llvm get-readline get-uv get-pcre get-double-conversion get-openlibm get-random get-openblas get-fftw get-suitesparse get-unwind get-gmp get-zlib get-patchelf
## PATHS ##
DIRS = $(addprefix $(BUILD)/,lib include bin share etc)
View
@@ -9,9 +9,7 @@ LAPACK_VER = 3.4.2
ARPACK_VER = 3.1.2
FFTW_VER = 3.3.3
SUITESPARSE_VER = 4.0.2
-CLP_VER = 1.14.5
UNWIND_VER = 1.1
-LIGHTTPD_VER = 1.4.32
GMP_VER=5.1.1
ZLIB_VER = 1.2.7
PATCHELF_VER = 0.6

0 comments on commit 0303fa1

Please sign in to comment.