[Pkg-julia-devel] [SCM] Julia branch, master, updated. debian/0.0.0+20121102.git63e93f2-1-12-g9bf4cc1
Sébastien Villemot
sebastien at debian.org
Tue Dec 18 14:48:24 UTC 2012
The following commit has been merged in the master branch:
commit 6a90fc20fcead3f964632f2fcc44329bc98aaafd
Author: Sébastien Villemot <sebastien at debian.org>
Date: Tue Dec 18 12:39:20 2012 +0100
Remove patches merged upstream or no longer necessary
+ fhs-multiarch.patch
+ linalg-test-tolerance.patch
+ remove-rpath.patch
+ use-system-c-ares.patch
+ use-system-ev.patch
+ verbose-build.patch
diff --git a/debian/patches/fhs-multiarch.patch b/debian/patches/fhs-multiarch.patch
deleted file mode 100644
index 9d6493f..0000000
--- a/debian/patches/fhs-multiarch.patch
+++ /dev/null
@@ -1,382 +0,0 @@
-Description: Reorganize file layout according to Debian Policy
- Install *.jl scripts and help file under /usr/share/julia (instead /usr/lib/julia).
- Install private libraries under /usr/lib/<arch>/julia (instead of /usr/lib).
-Author: Sébastien Villemot <sebastien at debian.org>
-Bug: https://github.com/JuliaLang/julia/issues/1560
-Last-Update: 2012-11-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/base/client.jl
-+++ b/base/client.jl
-@@ -227,10 +227,10 @@
-
- global const LOAD_PATH = String[
- ".",
-- abs_path("$JULIA_HOME/../lib/julia"),
-- abs_path("$JULIA_HOME/../lib/julia/base"),
-- abs_path("$JULIA_HOME/../lib/julia/extras"),
-- abs_path("$JULIA_HOME/../lib/julia/ui"),
-+ abs_path("$JULIA_HOME/../share/julia"),
-+ abs_path("$JULIA_HOME/../share/julia/base"),
-+ abs_path("$JULIA_HOME/../share/julia/extras"),
-+ abs_path("$JULIA_HOME/../share/julia/ui"),
- ]
-
- (quiet,repl,startup) = process_options(ARGS)
---- a/base/util.jl
-+++ b/base/util.jl
-@@ -101,13 +101,13 @@
- issrc = file[end-2:end] == ".jl"
- if issrc
- if file[1]!='/' && !is_file_readable(file)
-- file2 = "$JULIA_HOME/base/$file"
-+ file2 = "$JULIA_HOME/../share/julia/base/$file"
- if is_file_readable(file2)
- file = file2
- end
- end
- if editor == "emacs"
-- jmode = "$JULIA_HOME/contrib/julia-mode.el"
-+ jmode = "$JULIA_HOME/../share/julia/contrib/julia-mode.el"
- run(`emacs $file --eval "(progn
- (require 'julia-mode \"$jmode\")
- (julia-mode)
-@@ -283,7 +283,7 @@
- global _jl_help_category_list, _jl_help_category_dict, _jl_help_function_dict
- if _jl_help_category_dict == nothing
- println("Loading help data...")
-- helpdb = evalfile("$JULIA_HOME/../lib/julia/helpdb.jl")
-+ helpdb = evalfile("$JULIA_HOME/../share/julia/helpdb.jl")
- _jl_help_category_list = {}
- _jl_help_category_dict = Dict()
- _jl_help_function_dict = Dict()
---- a/src/dlload.c
-+++ b/src/dlload.c
-@@ -83,8 +83,7 @@
- handle->handle = NULL;
- if (modname[0] != '/') {
- if (julia_home) {
-- /* try julia_home/../lib */
-- snprintf(path, PATHBUF, "%s/../lib/%s%s", julia_home, modname, ext);
-+ snprintf(path, PATHBUF, "%s/../lib/" DEB_HOST_MULTIARCH "/julia/%s%s", julia_home, modname, ext);
- error = jl_uv_dlopen(path, handle);
- if (!error) goto done;
- // if file exists but didn't load, show error details
---- a/ui/repl.c
-+++ b/ui/repl.c
-@@ -121,10 +121,8 @@
- image_file = strdup(path);
- }
- else if (jl_stat(image_file, (char*)&stbuf) != 0) {
-- // otherwise try julia_home/../lib/julia/%s
-- snprintf(path, sizeof(path), "%s%s..%slib%sjulia%s%s",
-- julia_home, PATHSEPSTRING, PATHSEPSTRING,
-- PATHSEPSTRING, PATHSEPSTRING, image_file);
-+ snprintf(path, sizeof(path), "%s%s..%slib%s" DEB_HOST_MULTIARCH "%sjulia%s%s",
-+ julia_home, PATHSEPSTRING, PATHSEPSTRING, PATHSEPSTRING, PATHSEPSTRING, PATHSEPSTRING, image_file);
- image_file = strdup(path);
- }
- }
---- a/Make.inc
-+++ b/Make.inc
-@@ -3,8 +3,10 @@
- JULIA_VERSION = $(shell cat $(JULIAHOME)/VERSION)
- JULIA_COMMIT = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^Version:.*git//')
-
-+DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-+
- USR = $(JULIAHOME)/usr
--USRLIB = $(USR)/lib
-+USRLIB = $(USR)/lib/$(DEB_HOST_MULTIARCH)
- USRBIN = $(USR)/bin
- USRINC = $(USR)/include
- LLVMROOT = $(USR)
-@@ -79,7 +81,9 @@
- endif
-
- # if not absolute, then relative to JULIA_HOME
--JCFLAGS += '-DJL_SYSTEM_IMAGE_PATH="../lib/julia/sys.ji"'
-+JCFLAGS += '-DJL_SYSTEM_IMAGE_PATH="../lib/$(DEB_HOST_MULTIARCH)/julia/sys.ji"'
-+
-+JCFLAGS += '-DDEB_HOST_MULTIARCH="$(DEB_HOST_MULTIARCH)"'
-
- # OPENBLAS build options
- OPENBLAS_DYNAMIC_ARCH=0
-@@ -202,7 +206,7 @@
- INSTALL_NAME_CMD = true -ignore
- INSTALL_NAME_CHANGE_CMD = true -ignore
- SHLIB_EXT = so
--RPATH = -Wl,-rpath,'$$ORIGIN/../lib'
-+RPATH = -Wl,-rpath,'$$ORIGIN/../lib/$(DEB_HOST_MULTIARCH)/julia'
- RPATH_ORIGIN = -Wl,-rpath,'$$ORIGIN'
- OSLIBS += -ldl -lrt -Wl,--export-dynamic -Wl,--version-script=$(JULIAHOME)/src/julia.expmap -Wl,--no-whole-archive $(LIBUNWIND)
- WHOLE_ARCHIVE = -Wl,--whole-archive
---- a/deps/Makefile
-+++ b/deps/Makefile
-@@ -89,7 +89,7 @@
- rm -rf $(USR)
-
- ## PATHS ##
--DIRS = $(addprefix $(USR)/,lib include bin share etc)
-+DIRS = $(addprefix $(USR)/,lib lib/$(DEB_HOST_MULTIARCH) lib/$(DEB_HOST_MULTIARCH)/julia include bin share etc)
-
- $(foreach dir,$(DIRS),$(eval $(call dir_target,$(dir))))
-
-@@ -317,11 +317,11 @@
- GRISU_OPTS = -O3 -fvisibility=hidden $(fPIC)
-
- compile-double-conversion: libgrisu.$(SHLIB_EXT)
--install-double-conversion: $(USRLIB)/libgrisu.$(SHLIB_EXT)
-+install-double-conversion: $(USRLIB)/julia/libgrisu.$(SHLIB_EXT)
-
- libgrisu.$(SHLIB_EXT): double_conversion_wrapper.cpp
- $(CXX) $(GRISU_OPTS) -I/usr/include/double-conversion double_conversion_wrapper.cpp -shared -o libgrisu.$(SHLIB_EXT) -ldouble-conversion
--$(USRLIB)/libgrisu.$(SHLIB_EXT): libgrisu.$(SHLIB_EXT)
-+$(USRLIB)/julia/libgrisu.$(SHLIB_EXT): libgrisu.$(SHLIB_EXT)
- cp -f $< $@
- $(INSTALL_NAME_CMD)libgrisu.dylib $@
-
-@@ -335,7 +335,7 @@
- OPENLIBM_FLAGS = ARCH=i386
- endif
-
--OPENLIBM_OBJ_TARGET = $(USRLIB)/libopenlibm.$(SHLIB_EXT)
-+OPENLIBM_OBJ_TARGET = $(USRLIB)/julia/libopenlibm.$(SHLIB_EXT)
- OPENLIBM_OBJ_SOURCE = openlibm/libopenlibm.$(SHLIB_EXT)
-
- $(OPENLIBM_OBJ_SOURCE): openlibm/Makefile
-@@ -351,7 +351,7 @@
-
- ## Rmath ##
-
--RMATH_OBJ_TARGET = $(USRLIB)/libRmath.$(SHLIB_EXT)
-+RMATH_OBJ_TARGET = $(USRLIB)/julia/libRmath.$(SHLIB_EXT)
- RMATH_OBJ_SOURCE = Rmath/src/libRmath.$(SHLIB_EXT)
-
- compile-rmath: $(RMATH_OBJ_SOURCE)
-@@ -371,7 +371,7 @@
-
- ## LIBRANDOM ##
-
--LIBRANDOM_OBJ_TARGET = $(USRLIB)/librandom.$(SHLIB_EXT)
-+LIBRANDOM_OBJ_TARGET = $(USRLIB)/julia/librandom.$(SHLIB_EXT)
- LIBRANDOM_OBJ_SOURCE = random/librandom.$(SHLIB_EXT)
-
- LIBRANDOM_CFLAGS = $(CFLAGS) -O3 -finline-functions -fomit-frame-pointer -DNDEBUG -fno-strict-aliasing --param max-inline-insns-single=1800 -Wmissing-prototypes -Wall -std=c99 -DDSFMT_MEXP=19937 $(fPIC) -shared -DDSFMT_DO_NOT_USE_OLD_NAMES
-@@ -582,7 +582,7 @@
- endif
-
- compile-suitesparse: $(SUITESPARSE_OBJ_SOURCE)
--install-suitesparse: $(SUITESPARSE_OBJ_TARGET) $(USRLIB)/libsuitesparse_wrapper.$(SHLIB_EXT)
-+install-suitesparse: $(SUITESPARSE_OBJ_TARGET) $(USRLIB)/julia/libsuitesparse_wrapper.$(SHLIB_EXT)
-
- SuiteSparse-$(SUITESPARSE_VER).tar.gz:
- $(WGET) http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-$(SUITESPARSE_VER).tar.gz
-@@ -627,14 +627,14 @@
- SUITESPARSE_LIB = -L$(USRLIB) -lcholmod $(RPATH_ORIGIN)
- endif
-
--$(USRLIB)/libsuitesparse_wrapper.$(SHLIB_EXT): SuiteSparse_wrapper.c $(SUITESPARSE_OBJ_TARGET)
-- $(CC) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(SUITESPARSE_INC) SuiteSparse_wrapper.c -o $(USRLIB)/libsuitesparse_wrapper.$(SHLIB_EXT) $(SUITESPARSE_LIB)
-+$(USRLIB)/julia/libsuitesparse_wrapper.$(SHLIB_EXT): SuiteSparse_wrapper.c $(SUITESPARSE_OBJ_TARGET)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(SUITESPARSE_INC) SuiteSparse_wrapper.c -o $(USRLIB)/julia/libsuitesparse_wrapper.$(SHLIB_EXT) $(SUITESPARSE_LIB)
- $(INSTALL_NAME_CMD)libsuitesparse_wrapper.$(SHLIB_EXT) $@
- touch $@
--install-suitesparse-wrapper: $(USRLIB)/libsuitesparse_wrapper.$(SHLIB_EXT)
-+install-suitesparse-wrapper: $(USRLIB)/julia/libsuitesparse_wrapper.$(SHLIB_EXT)
-
- clean-suitesparse-wrapper:
-- rm -f $(SUITESPARSE_OBJ_TARGET) $(USRLIB)/libsuitesparse_wrapper.$(SHLIB_EXT)
-+ rm -f $(SUITESPARSE_OBJ_TARGET) $(USRLIB)/julia/libsuitesparse_wrapper.$(SHLIB_EXT)
- distclean-suitesparse-wrapper: clean-suitesparse-wrapper
-
- ## CLP ##
-@@ -773,14 +773,14 @@
- GMPW_LIB = -L$(USRLIB)/ -lgmp
- endif
-
--$(USRLIB)/libgmp_wrapper.$(SHLIB_EXT): gmp_wrapper.c $(GMP_OBJ_TARGET) | $(USRLIB)
-- $(CC) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GMPW_INC) gmp_wrapper.c -o $(USRLIB)/libgmp_wrapper.$(SHLIB_EXT) -Wl,-rpath,$(USRLIB) $(GMPW_LIB)
-+$(USRLIB)/julia/libgmp_wrapper.$(SHLIB_EXT): gmp_wrapper.c $(GMP_OBJ_TARGET) | $(USRLIB)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GMPW_INC) gmp_wrapper.c -o $(USRLIB)/julia/libgmp_wrapper.$(SHLIB_EXT) -Wl,-rpath,$(USRLIB) $(GMPW_LIB)
- $(INSTALL_NAME_CMD)libgmp_wrapper.$(SHLIB_EXT) $@
- touch $@
--install-gmp-wrapper: $(USRLIB)/libgmp_wrapper.$(SHLIB_EXT)
-+install-gmp-wrapper: $(USRLIB)/julia/libgmp_wrapper.$(SHLIB_EXT)
-
- clean-gmp-wrapper:
-- rm -f $(GMP_OBJ_TARGET) $(USRLIB)/libgmp_wrapper.$(SHLIB_EXT)
-+ rm -f $(GMP_OBJ_TARGET) $(USRLIB)/julia/libgmp_wrapper.$(SHLIB_EXT)
- distclean-gmp-wrapper: clean-gmp-wrapper
-
- ## GLPK ##
-@@ -792,7 +792,7 @@
- endif
-
- compile-glpk: install-glpk
--install-glpk: $(GLPK_OBJ_TARGET) $(USRLIB)/libglpk_wrapper.$(SHLIB_EXT)
-+install-glpk: $(GLPK_OBJ_TARGET) $(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT)
-
- glpk-$(GLPK_VER).tar.gz:
- $(WGET) http://ftp.gnu.org/gnu/glpk/$@
-@@ -826,15 +826,15 @@
- endif
-
-
--$(USRLIB)/libglpk_wrapper.$(SHLIB_EXT): glpk_wrapper.c $(GLPK_OBJ_TARGET)
-+$(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT): glpk_wrapper.c $(GLPK_OBJ_TARGET)
- mkdir -p $(USRLIB)
-- $(CC) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GLPKW_INC) glpk_wrapper.c $(GLPKW_LIB) -o $(USRLIB)/libglpk_wrapper.$(SHLIB_EXT) -Wl,-rpath,$(USRLIB)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GLPKW_INC) glpk_wrapper.c $(GLPKW_LIB) -o $(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT) -Wl,-rpath,$(USRLIB)
- $(INSTALL_NAME_CMD)libglpk_wrapper.$(SHLIB_EXT) $@
- touch $@
--install-glpk-wrapper: $(USRLIB)/libglpk_wrapper.$(SHLIB_EXT) glpk_wrapper.c
-+install-glpk-wrapper: $(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT) glpk_wrapper.c
-
- clean-glpk-wrapper:
-- rm -f $(GLPK_OBJ_TARGET) $(USRLIB)/libglpk_wrapper.$(SHLIB_EXT)
-+ rm -f $(GLPK_OBJ_TARGET) $(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT)
- distclean-glpk-wrapper: clean-glpk-wrapper
-
- ## ZLIB ##
---- a/ui/Makefile
-+++ b/ui/Makefile
-@@ -11,12 +11,12 @@
- SHIPFLAGS += $(FLAGS)
- JLDFLAGS += $(shell $(LLVM_CONFIG) --ldflags) $(OSLIBS) -lpthread $(LDFLAGS) $(RPATH)
-
--julia-release julia-debug: %: %-basic %-readline | $(USR)/lib/julia/website
-+julia-release julia-debug: %: %-basic %-readline | $(USR)/share/julia/website
- @$(MAKE) -C webserver $@
-
--$(eval $(call symlink_target,website,$(USR)/lib/julia))
-+$(eval $(call symlink_target,website,$(USR)/share/julia))
-
--release debug: | $(USR)/lib/julia/website
-+release debug: | $(USR)/share/julia/website
- $(MAKE) julia-$@
-
- %.o: %.c repl.h
-@@ -30,14 +30,14 @@
- julia-debug-readline: $(USRBIN)/julia-debug-readline
-
- $(USRBIN)/julia-release-basic: repl.o repl-basic.o
-- $(QUIET_LINK) $(CXX) $(SHIPFLAGS) $^ -o $@ -L$(USRLIB) $(JLDFLAGS) -ljulia-release
-+ $(QUIET_LINK) $(CXX) $(SHIPFLAGS) $^ -o $@ -L$(USRLIB)/julia $(JLDFLAGS) -ljulia-release
- $(USRBIN)/julia-debug-basic: repl.do repl-basic.do
-- $(QUIET_LINK) $(CXX) $(DEBUGFLAGS) $^ -o $@ -L$(USRLIB) $(JLDFLAGS) -ljulia-debug
-+ $(QUIET_LINK) $(CXX) $(DEBUGFLAGS) $^ -o $@ -L$(USRLIB)/julia $(JLDFLAGS) -ljulia-debug
-
- $(USRBIN)/julia-release-readline: repl.o repl-readline.o
-- $(QUIET_LINK) $(CXX) $(SHIPFLAGS) $^ -o $@ $(READLINE) -L$(USRLIB) $(JLDFLAGS) -ljulia-release
-+ $(QUIET_LINK) $(CXX) $(SHIPFLAGS) $^ -o $@ $(READLINE) -L$(USRLIB)/julia $(JLDFLAGS) -ljulia-release
- $(USRBIN)/julia-debug-readline: repl.do repl-readline.do
-- $(QUIET_LINK) $(CXX) $(DEBUGFLAGS) $^ -o $@ $(READLINE) -L$(USRLIB) $(JLDFLAGS) -ljulia-debug
-+ $(QUIET_LINK) $(CXX) $(DEBUGFLAGS) $^ -o $@ $(READLINE) -L$(USRLIB)/julia $(JLDFLAGS) -ljulia-debug
-
- clean: | $(CLEAN_TARGETS)
- $(MAKE) -C webserver $@
---- a/base/sysimg.jl
-+++ b/base/sysimg.jl
-@@ -275,5 +275,7 @@
- import Base.*
-
- # create system image file
-+DEB_HOST_MULTIARCH = chop(readall(`dpkg-architecture -qDEB_HOST_MULTIARCH`))
-+
- ccall(:jl_save_system_image, Void, (Ptr{Uint8},Ptr{Uint8}),
-- "$JULIA_HOME/../lib/julia/sys.ji", "start_image.jl")
-+ "$JULIA_HOME/../lib/$DEB_HOST_MULTIARCH/julia/sys.ji", "start_image.jl")
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -77,13 +77,13 @@
- $(QUIET_LINK) ar -rcs $@ $(DOBJS)
- libjulia-debug: $(USRLIB)/libjulia-debug.$(SHLIB_EXT)
-
--$(USRLIB)/libjulia-release.$(SHLIB_EXT): julia.expmap $(OBJS) flisp/libflisp.a support/libsupport.a
-+$(USRLIB)/julia/libjulia-release.$(SHLIB_EXT): julia.expmap $(OBJS) flisp/libflisp.a support/libsupport.a
- $(QUIET_LINK) $(CXX) $(SHIPFLAGS) $(OBJS) $(LIBS) -shared -o $@ $(LDFLAGS)
- $(INSTALL_NAME_CMD)libjulia-release.$(SHLIB_EXT) $@
- libjulia-release.a: julia.expmap $(OBJS) flisp/libflisp.a support/libsupport.a
- rm -f $@
- $(QUIET_LINK) ar -rcs $@ $(OBJS)
--libjulia-release: $(USRLIB)/libjulia-release.$(SHLIB_EXT)
-+libjulia-release: $(USRLIB)/julia/libjulia-release.$(SHLIB_EXT)
-
- clean:
- rm -f $(USRLIB)/libjulia*
---- a/deps/Rmath/src/Makefile
-+++ b/deps/Rmath/src/Makefile
-@@ -42,7 +42,7 @@
-
- libRmath.$(SHLIB_EXT): $(XOBJS)
- rm -rf $@
-- $(QUIET_LINK) $(CC) -shared -o $@ $^ -L$(USRLIB) -lrandom $(RPATH_ORIGIN)
-+ $(QUIET_LINK) $(CC) -shared -o $@ $^ -L$(USRLIB)/julia -lrandom $(RPATH_ORIGIN)
-
- clean:
- rm -f *.o *.do *.a *.$(SHLIB_EXT) core* *~ *#
---- a/Makefile
-+++ b/Makefile
-@@ -4,10 +4,10 @@
- all: default
- default: release
-
--DIRS = $(BUILD)/bin $(BUILD)/etc $(BUILD)/lib/julia $(BUILD)/share/julia
-+DIRS = $(BUILD)/bin $(BUILD)/etc $(BUILD)/lib/$(DEB_HOST_MULTIARCH)/julia $(BUILD)/share/julia
-
- $(foreach dir,$(DIRS),$(eval $(call dir_target,$(dir))))
--$(foreach link,extras base ui test,$(eval $(call symlink_target,$(link),$(BUILD)/lib/julia)))
-+$(foreach link,extras base ui test,$(eval $(call symlink_target,$(link),$(BUILD)/share/julia)))
- $(foreach link,doc examples,$(eval $(call symlink_target,$(link),$(BUILD)/share/julia)))
-
- MAKEs = $(MAKE)
-@@ -15,9 +15,9 @@
- MAKEs += -s
- endif
-
--debug release: | $(DIRS) $(BUILD)/lib/julia/extras $(BUILD)/lib/julia/base $(BUILD)/lib/julia/ui $(BUILD)/lib/julia/test $(BUILD)/share/julia/doc $(BUILD)/share/julia/examples
-+debug release: | $(DIRS) $(BUILD)/share/julia/extras $(BUILD)/share/julia/base $(BUILD)/share/julia/ui $(BUILD)/share/julia/test $(BUILD)/share/julia/doc $(BUILD)/share/julia/examples
- @$(MAKEs) julia-$@
-- @$(MAKEs) JULIA_EXECUTABLE=$(JULIA_EXECUTABLE_$@) $(BUILD)/lib/julia/sys.ji
-+ @$(MAKEs) JULIA_EXECUTABLE=$(JULIA_EXECUTABLE_$@) $(BUILD)/lib/$(DEB_HOST_MULTIARCH)/julia/sys.ji
-
- julia-debug julia-release:
- @$(MAKEs) -C deps
-@@ -27,13 +27,13 @@
- @$(MAKEs) -C ui $@
- @ln -sf $(BUILD)/bin/$@-$(DEFAULT_REPL) julia
-
--$(BUILD)/lib/julia/helpdb.jl: doc/helpdb.jl | $(BUILD)/lib/julia
-+$(BUILD)/share/julia/helpdb.jl: doc/helpdb.jl | $(BUILD)/share/julia
- @cp $< $@
-
- # use sys.ji if it exists, otherwise run two stages
--$(BUILD)/lib/julia/sys.ji: VERSION base/*.jl $(BUILD)/lib/julia/helpdb.jl
-+$(BUILD)/lib/$(DEB_HOST_MULTIARCH)/julia/sys.ji: VERSION base/*.jl $(BUILD)/share/julia/helpdb.jl
- $(QUIET_JULIA) cd base && \
-- (test -f $(BUILD)/lib/julia/sys.ji || $(JULIA_EXECUTABLE) -bf sysimg.jl) && $(JULIA_EXECUTABLE) -f sysimg.jl || echo "Note: this error is usually fixed by running 'make clean'."
-+ (test -f $(BUILD)/lib/$(DEB_HOST_MULTIARCH)/julia/sys.ji || $(JULIA_EXECUTABLE) -bf sysimg.jl) && $(JULIA_EXECUTABLE) -f sysimg.jl || echo "Note: this error is usually fixed by running 'make clean'."
-
- ifeq ($(OS), WINNT)
- OPENBLASNAME=openblas-r0.1.1
-@@ -43,15 +43,15 @@
- PREFIX ?= julia-$(JULIA_COMMIT)
- install: release
- @$(MAKEs) -C test/unicode
-- for subdir in "sbin" "bin" "etc" "lib/julia" "share/julia" ; do \
-+ for subdir in "sbin" "bin" "etc" "lib/$(DEB_HOST_MULTIARCH)/julia" "share/julia" ; do \
- mkdir -p $(PREFIX)/$$subdir ; \
- done
- cp $(BUILD)/bin/*julia* $(PREFIX)/bin
- cd $(PREFIX)/bin && ln -s julia-release-$(DEFAULT_REPL) julia
-- cp -R -L $(BUILD)/lib/julia/* $(PREFIX)/lib/julia
-- -cp $(BUILD)/lib/lib{Rmath,amd,arpack,cholmod,colamd,openlibm,fftw3,fftw3f,fftw3_threads,fftw3f_threads,glpk,glpk_wrapper,gmp,gmp_wrapper,grisu,history,julia-release,$(OPENBLASNAME),openlibm,pcre,random,readline,suitesparse_wrapper,tk_wrapper,umfpack,z}.$(SHLIB_EXT) $(PREFIX)/lib
-+ cp -R -L $(BUILD)/lib/$(DEB_HOST_MULTIARCH)/julia/* $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)/julia
-+ -cp $(BUILD)/lib/$(DEB_HOST_MULTIARCH)/lib{Rmath,amd,arpack,cholmod,colamd,openlibm,fftw3,fftw3f,fftw3_threads,fftw3f_threads,glpk,glpk_wrapper,gmp,gmp_wrapper,grisu,history,julia-release,$(OPENBLASNAME),openlibm,pcre,random,readline,suitesparse_wrapper,tk_wrapper,umfpack,z}.$(SHLIB_EXT) $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
- # Web-REPL stuff
-- -cp $(BUILD)/lib/mod* $(PREFIX)/lib
-+ -cp $(BUILD)/lib/$(DEB_HOST_MULTIARCH)/mod* $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
- -cp $(BUILD)/sbin/* $(PREFIX)/sbin
- -cp $(BUILD)/etc/* $(PREFIX)/etc
- -cp -R -L $(BUILD)/share/* $(PREFIX)/share
diff --git a/debian/patches/linalg-test-tolerance.patch b/debian/patches/linalg-test-tolerance.patch
deleted file mode 100644
index 3150baf..0000000
--- a/debian/patches/linalg-test-tolerance.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Allow for epsilon error in some linear algebra test
- Without this patch, the test fails on i386 with reference BLAS/LAPACK.
-Author: Sébastien Villemot <sebastien at debian.org>
-Forwarded: no
-Last-Update: 2012-11-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/test/linalg.jl
-+++ b/test/linalg.jl
-@@ -48,7 +48,7 @@
- @assert norm(q'*q - eye(n)) < Eps
- @assert norm(q*q' - eye(n)) < Eps
- Q,R = qr(a)
-- @assert q == Q && r == R
-+ @assert norm(q - Q) < Eps && norm(r - R) < Eps
- @assert norm(q*r - a) < Eps
- @assert norm(qra*b - Q*b) < Eps
- @assert norm(qra'*b - Q'*b) < Eps
-@@ -59,7 +59,7 @@
- @assert norm(q'*q - eye(n)) < Eps
- @assert norm(q*q' - eye(n)) < Eps
- Q,R,P = qrp(a)
-- @assert q == Q && r == R && p == P
-+ @assert norm(q - Q) < Eps && norm(r - R) < Eps && norm(p - P) < Eps
- @assert norm(q*r - a[:,p]) < Eps
- @assert norm(q*r[:,invperm(p)] - a) < Eps
- @assert norm(a*(qrpa\b) - b) < Eps
diff --git a/debian/patches/remove-rpath.patch b/debian/patches/remove-rpath.patch
deleted file mode 100644
index e49ee93..0000000
--- a/debian/patches/remove-rpath.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Remove useless RPATHs pointing to system library directory
-Author: Sébastien Villemot <sebastien at debian.org>
-Forwarded: not-needed
-Last-Update: 2012-11-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/deps/Makefile
-+++ b/deps/Makefile
-@@ -774,7 +774,7 @@
- endif
-
- $(USRLIB)/julia/libgmp_wrapper.$(SHLIB_EXT): gmp_wrapper.c $(GMP_OBJ_TARGET) | $(USRLIB)
-- $(CC) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GMPW_INC) gmp_wrapper.c -o $(USRLIB)/julia/libgmp_wrapper.$(SHLIB_EXT) -Wl,-rpath,$(USRLIB) $(GMPW_LIB)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GMPW_INC) gmp_wrapper.c -o $(USRLIB)/julia/libgmp_wrapper.$(SHLIB_EXT) $(GMPW_LIB)
- $(INSTALL_NAME_CMD)libgmp_wrapper.$(SHLIB_EXT) $@
- touch $@
- install-gmp-wrapper: $(USRLIB)/julia/libgmp_wrapper.$(SHLIB_EXT)
-@@ -828,7 +828,7 @@
-
- $(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT): glpk_wrapper.c $(GLPK_OBJ_TARGET)
- mkdir -p $(USRLIB)
-- $(CC) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GLPKW_INC) glpk_wrapper.c $(GLPKW_LIB) -o $(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT) -Wl,-rpath,$(USRLIB)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GLPKW_INC) glpk_wrapper.c $(GLPKW_LIB) -o $(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT)
- $(INSTALL_NAME_CMD)libglpk_wrapper.$(SHLIB_EXT) $@
- touch $@
- install-glpk-wrapper: $(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT) glpk_wrapper.c
diff --git a/debian/patches/series b/debian/patches/series
index 5ac7132..7e4e069 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,17 +1,11 @@
no-git.patch
use-system-double-conversion.patch
do-not-download-dsfmt.patch
-verbose-build.patch
fix-clean-rules.patch
suitesparse-3.4.patch
do-not-download-jquery.patch
-fhs-multiarch.patch
-remove-rpath.patch
use-shared-llvm.patch
-use-system-c-ares.patch
-use-system-ev.patch
use-sonames-with-dlopen.patch
dpkg-buildflags.patch
support-noopt.patch
fix-cpu-detection.patch
-linalg-test-tolerance.patch
diff --git a/debian/patches/use-system-c-ares.patch b/debian/patches/use-system-c-ares.patch
deleted file mode 100644
index f858ed7..0000000
--- a/debian/patches/use-system-c-ares.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-Description: Use system libc-ares instead of libuv's embedded copy
-Author: Jérémy Lal <kapouer at melix.org>
-Author: Sébastien Villemot <sebastien at debian.org>
-Forwarded: not-needed
-Last-Update: 2012-11-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-
-
---- a/deps/libuv/Makefile
-+++ b/deps/libuv/Makefile
-@@ -26,51 +26,6 @@
-
- CPPFLAGS += -Iinclude -Iinclude/uv-private
-
--CARES_OBJS =
--CARES_OBJS += src/ares/ares__close_sockets.o
--CARES_OBJS += src/ares/ares__get_hostent.o
--CARES_OBJS += src/ares/ares__read_line.o
--CARES_OBJS += src/ares/ares__timeval.o
--CARES_OBJS += src/ares/ares_cancel.o
--CARES_OBJS += src/ares/ares_data.o
--CARES_OBJS += src/ares/ares_destroy.o
--CARES_OBJS += src/ares/ares_expand_name.o
--CARES_OBJS += src/ares/ares_expand_string.o
--CARES_OBJS += src/ares/ares_fds.o
--CARES_OBJS += src/ares/ares_free_hostent.o
--CARES_OBJS += src/ares/ares_free_string.o
--CARES_OBJS += src/ares/ares_gethostbyaddr.o
--CARES_OBJS += src/ares/ares_gethostbyname.o
--CARES_OBJS += src/ares/ares_getnameinfo.o
--CARES_OBJS += src/ares/ares_getopt.o
--CARES_OBJS += src/ares/ares_getsock.o
--CARES_OBJS += src/ares/ares_init.o
--CARES_OBJS += src/ares/ares_library_init.o
--CARES_OBJS += src/ares/ares_llist.o
--CARES_OBJS += src/ares/ares_mkquery.o
--CARES_OBJS += src/ares/ares_nowarn.o
--CARES_OBJS += src/ares/ares_options.o
--CARES_OBJS += src/ares/ares_parse_a_reply.o
--CARES_OBJS += src/ares/ares_parse_aaaa_reply.o
--CARES_OBJS += src/ares/ares_parse_mx_reply.o
--CARES_OBJS += src/ares/ares_parse_ns_reply.o
--CARES_OBJS += src/ares/ares_parse_ptr_reply.o
--CARES_OBJS += src/ares/ares_parse_srv_reply.o
--CARES_OBJS += src/ares/ares_parse_txt_reply.o
--CARES_OBJS += src/ares/ares_process.o
--CARES_OBJS += src/ares/ares_query.o
--CARES_OBJS += src/ares/ares_search.o
--CARES_OBJS += src/ares/ares_send.o
--CARES_OBJS += src/ares/ares_strcasecmp.o
--CARES_OBJS += src/ares/ares_strdup.o
--CARES_OBJS += src/ares/ares_strerror.o
--CARES_OBJS += src/ares/ares_timeout.o
--CARES_OBJS += src/ares/ares_version.o
--CARES_OBJS += src/ares/ares_writev.o
--CARES_OBJS += src/ares/bitncmp.o
--CARES_OBJS += src/ares/inet_net_pton.o
--CARES_OBJS += src/ares/inet_ntop.o
--
- ifneq (,$(findstring MINGW,$(uname_S)))
- include config-mingw.mk
- else
-@@ -82,9 +37,6 @@
-
- all: uv.a
-
--$(CARES_OBJS): %.o: %.c
-- $(CC) -o $*.o -c $(CFLAGS) $(CPPFLAGS) $< -DHAVE_CONFIG_H
--
- test/run-tests$(E): test/*.h test/run-tests.c $(RUNNER_SRC) test/runner-unix.c $(TESTS) uv.a
- $(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o test/run-tests test/run-tests.c \
- test/runner.c $(RUNNER_SRC) $(TESTS) uv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS)
---- a/deps/libuv/config-unix.mk
-+++ b/deps/libuv/config-unix.mk
-@@ -68,16 +68,16 @@
- EV_CONFIG=config_linux.h
- EIO_CONFIG=config_linux.h
- CSTDFLAG += -D_GNU_SOURCE
--CPPFLAGS += -Isrc/ares/config_linux
--LINKFLAGS+=-ldl -lrt
-+CPPFLAGS += -I/usr/include
-+LINKFLAGS+=-ldl -lrt -lc-ares
- OBJS += src/unix/linux/core.o src/unix/linux/inotify.o src/unix/linux/syscalls.o
- endif
-
- ifeq (FreeBSD,$(uname_S))
- EV_CONFIG=config_freebsd.h
- EIO_CONFIG=config_freebsd.h
--CPPFLAGS += -Isrc/ares/config_freebsd
--LINKFLAGS+=-lkvm
-+CPPFLAGS += -I/usr/include
-+LINKFLAGS+=-lkvm -lc-ares
- OBJS += src/unix/freebsd.o
- OBJS += src/unix/kqueue.o
- endif
-@@ -132,8 +132,8 @@
- RUNNER_LIBS=
- RUNNER_SRC=test/runner-unix.c
-
--uv.a: $(OBJS) src/uv-common.o src/unix/ev/ev.o src/unix/uv-eio.o src/unix/eio/eio.o $(CARES_OBJS)
-- $(AR) rcs uv.a $(OBJS) src/uv-common.o src/unix/uv-eio.o src/unix/ev/ev.o src/unix/eio/eio.o $(CARES_OBJS)
-+uv.a: $(OBJS) src/uv-common.o src/unix/ev/ev.o src/unix/uv-eio.o src/unix/eio/eio.o
-+ $(AR) rcs uv.a $(OBJS) src/uv-common.o src/unix/uv-eio.o src/unix/ev/ev.o src/unix/eio/eio.o
-
- src/unix/%.o: src/unix/%.c include/uv.h include/uv-private/uv-unix.h src/unix/internal.h
- $(CC) $(CSTDFLAG) $(CPPFLAGS) -Isrc $(CFLAGS) -c $< -o $@
-@@ -158,7 +158,6 @@
-
-
- clean-platform:
-- -rm -f src/ares/*.o
- -rm -f src/unix/*.o
- -rm -f src/unix/ev/*.o
- -rm -f src/unix/eio/*.o
-@@ -166,7 +165,6 @@
- -rm -rf test/run-tests.dSYM run-benchmarks.dSYM
-
- distclean-platform:
-- -rm -f src/ares/*.o
- -rm -f src/unix/*.o
- -rm -f src/unix/ev/*.o
- -rm -f src/unix/eio/*.o
---- a/deps/libuv/src/uv-common.c
-+++ b/deps/libuv/src/uv-common.c
-@@ -28,9 +28,8 @@
- #include <string.h> /* memset */
-
- /* use inet_pton from c-ares if necessary */
--#include "ares_config.h"
--#include "ares/inet_net_pton.h"
--#include "ares/inet_ntop.h"
-+#include <ares.h>
-+#include <arpa/inet.h>
-
- #define XX(uc, lc) case UV_##uc: return sizeof(uv_##lc##_t);
-
-@@ -181,20 +180,20 @@
-
- addr.sin6_family = AF_INET6;
- addr.sin6_port = htons(port);
-- ares_inet_pton(AF_INET6, ip, &addr.sin6_addr);
-+ inet_pton(AF_INET6, ip, &addr.sin6_addr);
-
- return addr;
- }
-
-
- int uv_ip4_name(struct sockaddr_in* src, char* dst, size_t size) {
-- const char* d = ares_inet_ntop(AF_INET, &src->sin_addr, dst, size);
-+ const char* d = inet_ntop(AF_INET, &src->sin_addr, dst, size);
- return d != dst;
- }
-
-
- int uv_ip6_name(struct sockaddr_in6* src, char* dst, size_t size) {
-- const char* d = ares_inet_ntop(AF_INET6, &src->sin6_addr, dst, size);
-+ const char* d = inet_ntop(AF_INET6, &src->sin6_addr, dst, size);
- return d != dst;
- }
-
---- a/deps/libuv/include/uv.h
-+++ b/deps/libuv/include/uv.h
-@@ -55,7 +55,7 @@
- #include <stdint.h> /* int64_t */
- #include <sys/types.h> /* size_t */
-
--#include "ares.h"
-+#include <ares.h>
-
- #if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED)
- typedef intptr_t ssize_t;
---- a/src/flisp/Makefile
-+++ b/src/flisp/Makefile
-@@ -19,7 +19,7 @@
- FLAGS = -Wall -Wno-strict-aliasing -I$(LLTDIR) $(CFLAGS) \
- -DUSE_COMPUTED_GOTO $(HFILEDIRS:%=-I%) $(LIBDIRS:%=-L%) -fvisibility=hidden
- LIBFILES = $(LLT)
--LIBS = $(LIBFILES) -lm -lpthread
-+LIBS = $(LIBFILES) -lm -lpthread -lcares
-
- DEBUGFLAGS += $(FLAGS)
- SHIPFLAGS += $(FLAGS)
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -15,7 +15,7 @@
- -I$(shell $(LLVM_CONFIG) --includedir) \
- -I$(JULIAHOME)/deps/libuv/include -I$(JULIAHOME)/usr/include
-
--LIBS = -lLLVM-3.1 $(WHOLE_ARCHIVE) $(JULIAHOME)/src/flisp/libflisp.a $(WHOLE_ARCHIVE) $(JULIAHOME)/src/support/libsupport.a -L$(USR)/lib $(USRLIB)/uv.a $(OSLIBS) -lpthread $(shell $(LLVM_CONFIG) --ldflags)
-+LIBS = -lLLVM-3.1 $(WHOLE_ARCHIVE) $(JULIAHOME)/src/flisp/libflisp.a $(WHOLE_ARCHIVE) $(JULIAHOME)/src/support/libsupport.a -L$(USR)/lib $(USRLIB)/uv.a -lcares $(OSLIBS) -lpthread $(shell $(LLVM_CONFIG) --ldflags)
-
- ifneq ($(MAKECMDGOALS),debug)
- TARGET =
---- a/ui/webserver/Makefile
-+++ b/ui/webserver/Makefile
-@@ -4,7 +4,7 @@
- override CFLAGS += $(JCFLAGS)
- override CXXFLAGS += $(JCXXFLAGS)
-
--LIBS = -lpthread $(USRLIB)/uv.a
-+LIBS = -lpthread $(USRLIB)/uv.a -lcares
- ifeq ($(OS), Linux)
- LIBS += -lrt
- endif
diff --git a/debian/patches/use-system-ev.patch b/debian/patches/use-system-ev.patch
deleted file mode 100644
index 30e3677..0000000
--- a/debian/patches/use-system-ev.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-Description: Use system libev instead of libuv's embeddded copy
-Author: Jérémy Lal <kapouer at melix.org>
-Author: Sébastien Villemot <sebastien at debian.org>
-Forwarded: not-needed
-Last-Update: 2012-11-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/deps/libuv/include/uv-private/uv-unix.h
-+++ b/deps/libuv/include/uv-private/uv-unix.h
-@@ -24,7 +24,7 @@
-
- #include "ngx-queue.h"
-
--#include "ev.h"
-+#include <ev.h>
- #include "eio.h"
-
- #include <sys/types.h>
---- a/deps/libuv/config-unix.mk
-+++ b/deps/libuv/config-unix.mk
-@@ -19,9 +19,8 @@
- # IN THE SOFTWARE.
-
- E=
--CSTDFLAG=--std=c89 -pedantic -Wall -Wextra -Wno-unused-parameter
-+CSTDFLAG=-pedantic -Wall -Wextra -Wno-unused-parameter
- CFLAGS += -g
--CPPFLAGS += -Isrc/unix/ev
- LINKFLAGS=-lm
-
- CPPFLAGS += -D_LARGEFILE_SOURCE
-@@ -69,7 +68,7 @@
- EIO_CONFIG=config_linux.h
- CSTDFLAG += -D_GNU_SOURCE
- CPPFLAGS += -I/usr/include
--LINKFLAGS+=-ldl -lrt -lc-ares
-+LINKFLAGS+=-ldl -lrt -lc-ares -lev
- OBJS += src/unix/linux/core.o src/unix/linux/inotify.o src/unix/linux/syscalls.o
- endif
-
-@@ -77,7 +76,7 @@
- EV_CONFIG=config_freebsd.h
- EIO_CONFIG=config_freebsd.h
- CPPFLAGS += -I/usr/include
--LINKFLAGS+=-lkvm -lc-ares
-+LINKFLAGS+=-lkvm -lc-ares -lev
- OBJS += src/unix/freebsd.o
- OBJS += src/unix/kqueue.o
- endif
-@@ -132,8 +131,8 @@
- RUNNER_LIBS=
- RUNNER_SRC=test/runner-unix.c
-
--uv.a: $(OBJS) src/uv-common.o src/unix/ev/ev.o src/unix/uv-eio.o src/unix/eio/eio.o
-- $(AR) rcs uv.a $(OBJS) src/uv-common.o src/unix/uv-eio.o src/unix/ev/ev.o src/unix/eio/eio.o
-+uv.a: $(OBJS) src/uv-common.o src/unix/uv-eio.o src/unix/eio/eio.o
-+ $(AR) rcs uv.a $(OBJS) src/uv-common.o src/unix/uv-eio.o src/unix/eio/eio.o
-
- src/unix/%.o: src/unix/%.c include/uv.h include/uv-private/uv-unix.h src/unix/internal.h
- $(CC) $(CSTDFLAG) $(CPPFLAGS) -Isrc $(CFLAGS) -c $< -o $@
-@@ -141,9 +140,6 @@
- src/uv-common.o: src/uv-common.c include/uv.h include/uv-private/uv-unix.h
- $(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c src/uv-common.c -o src/uv-common.o
-
--src/unix/ev/ev.o: src/unix/ev/ev.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c src/unix/ev/ev.c -o src/unix/ev/ev.o -DEV_CONFIG_H=\"$(EV_CONFIG)\"
--
-
- EIO_CPPFLAGS += $(CPPFLAGS)
- EIO_CPPFLAGS += -DEIO_CONFIG_H=\"$(EIO_CONFIG)\"
---- a/src/flisp/Makefile
-+++ b/src/flisp/Makefile
-@@ -19,7 +19,7 @@
- FLAGS = -Wall -Wno-strict-aliasing -I$(LLTDIR) $(CFLAGS) \
- -DUSE_COMPUTED_GOTO $(HFILEDIRS:%=-I%) $(LIBDIRS:%=-L%) -fvisibility=hidden
- LIBFILES = $(LLT)
--LIBS = $(LIBFILES) -lm -lpthread -lcares
-+LIBS = $(LIBFILES) -lm -lpthread -lcares -lev
-
- DEBUGFLAGS += $(FLAGS)
- SHIPFLAGS += $(FLAGS)
---- a/deps/libuv/include/uv.h
-+++ b/deps/libuv/include/uv.h
-@@ -224,9 +224,6 @@
- UV_EXTERN uv_loop_t* uv_loop_new(void);
- UV_EXTERN void uv_loop_delete(uv_loop_t*);
-
--/* This is a debugging tool. It's NOT part of the official API. */
--UV_EXTERN int uv_loop_refcount(const uv_loop_t*);
--
-
- /*
- * Returns the default loop.
---- a/deps/libuv/src/unix/core.c
-+++ b/deps/libuv/src/unix/core.c
-@@ -165,11 +165,6 @@
- }
-
-
--int uv_loop_refcount(const uv_loop_t* loop) {
-- return ev_loop_refcount(loop->ev);
--}
--
--
- void uv__run(uv_loop_t* loop) {
- ev_run(loop->ev, EVRUN_ONCE);
-
-@@ -179,10 +174,7 @@
-
-
- int uv_run(uv_loop_t* loop) {
-- do
-- uv__run(loop);
-- while (uv_loop_refcount(loop) > 0);
--
-+ ev_run(loop->ev, 0);
- return 0;
- }
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -15,7 +15,7 @@
- -I$(shell $(LLVM_CONFIG) --includedir) \
- -I$(JULIAHOME)/deps/libuv/include -I$(JULIAHOME)/usr/include
-
--LIBS = -lLLVM-3.1 $(WHOLE_ARCHIVE) $(JULIAHOME)/src/flisp/libflisp.a $(WHOLE_ARCHIVE) $(JULIAHOME)/src/support/libsupport.a -L$(USR)/lib $(USRLIB)/uv.a -lcares $(OSLIBS) -lpthread $(shell $(LLVM_CONFIG) --ldflags)
-+LIBS = -lLLVM-3.1 $(WHOLE_ARCHIVE) $(JULIAHOME)/src/flisp/libflisp.a $(WHOLE_ARCHIVE) $(JULIAHOME)/src/support/libsupport.a -L$(USR)/lib $(USRLIB)/uv.a -lcares -lev $(OSLIBS) -lpthread $(shell $(LLVM_CONFIG) --ldflags)
-
- ifneq ($(MAKECMDGOALS),debug)
- TARGET =
---- a/ui/webserver/Makefile
-+++ b/ui/webserver/Makefile
-@@ -4,7 +4,7 @@
- override CFLAGS += $(JCFLAGS)
- override CXXFLAGS += $(JCXXFLAGS)
-
--LIBS = -lpthread $(USRLIB)/uv.a -lcares
-+LIBS = -lpthread $(USRLIB)/uv.a -lcares -lev
- ifeq ($(OS), Linux)
- LIBS += -lrt
- endif
diff --git a/debian/patches/verbose-build.patch b/debian/patches/verbose-build.patch
deleted file mode 100644
index d0b0b30..0000000
--- a/debian/patches/verbose-build.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Description: Respect environment variable USE_QUIET during make
-Origin: upstream, https://github.com/JuliaLang/julia/commit/50b0e312a719075ef75a4c75566a0783b293c526
-Last-Update: 2012-11-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/Make.inc b/Make.inc
-index 0465d05..20b847f 100644
---- a/Make.inc
-+++ b/Make.inc
-@@ -309,8 +309,9 @@ endif
-
-
- # Colors for make
--
-+ifndef USE_QUIET
- USE_QUIET = 1
-+endif
- ifeq ($(USE_QUIET), 1)
-
- CCCOLOR="\033[34m"
-diff --git a/Makefile b/Makefile
-index 7a6f062..a0ed22d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,16 +10,21 @@ $(foreach dir,$(DIRS),$(eval $(call dir_target,$(dir))))
- $(foreach link,extras base ui test,$(eval $(call symlink_target,$(link),$(BUILD)/lib/julia)))
- $(foreach link,doc examples,$(eval $(call symlink_target,$(link),$(BUILD)/share/julia)))
-
-+MAKEs = $(MAKE)
-+ifeq ($(USE_QUIET), 1)
-+MAKEs += -s
-+endif
-+
- debug release: | $(DIRS) $(BUILD)/lib/julia/extras $(BUILD)/lib/julia/base $(BUILD)/lib/julia/ui $(BUILD)/lib/julia/test $(BUILD)/share/julia/doc $(BUILD)/share/julia/examples
-- @$(MAKE) -s julia-$@
-- @$(MAKE) JULIA_EXECUTABLE=$(JULIA_EXECUTABLE_$@) -s $(BUILD)/lib/julia/sys.ji
-+ @$(MAKEs) julia-$@
-+ @$(MAKEs) JULIA_EXECUTABLE=$(JULIA_EXECUTABLE_$@) $(BUILD)/lib/julia/sys.ji
-
- julia-debug julia-release:
-- @$(MAKE) -sC deps
-- @$(MAKE) -sC src lib$@
-- @$(MAKE) -sC base
-- @$(MAKE) -sC extras
-- @$(MAKE) -sC ui $@
-+ @$(MAKEs) -C deps
-+ @$(MAKEs) -C src lib$@
-+ @$(MAKEs) -C base
-+ @$(MAKEs) -C extras
-+ @$(MAKEs) -C ui $@
- @ln -sf $(BUILD)/bin/$@-$(DEFAULT_REPL) julia
-
- $(BUILD)/lib/julia/helpdb.jl: doc/helpdb.jl | $(BUILD)/lib/julia
-@@ -37,7 +42,7 @@ OPENBLASNAME=openblas
- endif
- PREFIX ?= julia-$(JULIA_COMMIT)
- install: release
-- @$(MAKE) -sC test/unicode
-+ @$(MAKEs) -C test/unicode
- for subdir in "sbin" "bin" "etc" "lib/julia" "share/julia" ; do \
- mkdir -p $(PREFIX)/$$subdir ; \
- done
-@@ -77,28 +82,28 @@ h2j: $(BUILD)/lib/libLLVM*.a $(BUILD)/lib/libclang*.a src/h2j.cpp
- $(QUIET_CC) g++ -O2 -fno-rtti -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -Iinclude $^ -o $@
-
- clean: | $(CLEAN_TARGETS)
-- @$(MAKE) -sC base clean
-- @$(MAKE) -sC extras clean
-- @$(MAKE) -sC src clean
-- @$(MAKE) -sC ui clean
-- @$(MAKE) -sC ui/webserver clean
-- @$(MAKE) -sC test/unicode clean
-+ @$(MAKE) -C base clean
-+ @$(MAKE) -C extras clean
-+ @$(MAKE) -C src clean
-+ @$(MAKE) -C ui clean
-+ @$(MAKE) -C ui/webserver clean
-+ @$(MAKE) -C test/unicode clean
- @rm -f julia-{release,debug}-{basic,readline,webserver}
- @rm -f *~ *# *.tar.gz
- @rm -fr $(BUILD)/lib/julia
-
- cleanall: clean
-- @$(MAKE) -sC src clean-flisp clean-support
--# @$(MAKE) -sC deps clean-uv
-+ @$(MAKE) -C src clean-flisp clean-support
-+# @$(MAKE) -C deps clean-uv
-
- .PHONY: default debug release julia-debug julia-release \
- test testall test-* clean cleanall
-
- test: release
-- @$(MAKE) -sC test default
-+ @$(MAKEs) -C test default
-
- testall: release
-- @$(MAKE) -sC test all
-+ @$(MAKEs) -C test all
-
- test-%: release
-- @$(MAKE) -sC test $*
-+ @$(MAKEs) -C test $*
--
Julia
More information about the Pkg-julia-devel
mailing list