[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 0351020c800407854997daea3aa70d8084f97d85
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Dec 18 12:42:49 2012 +0100

    Refresh other patches

diff --git a/debian/patches/do-not-download-dsfmt.patch b/debian/patches/do-not-download-dsfmt.patch
index 663330b..cbd5d9b 100644
--- a/debian/patches/do-not-download-dsfmt.patch
+++ b/debian/patches/do-not-download-dsfmt.patch
@@ -7,7 +7,7 @@ Last-Update: 2012-11-18
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/deps/Makefile
 +++ b/deps/Makefile
-@@ -382,15 +382,6 @@
+@@ -402,15 +402,6 @@
  compile-random: $(LIBRANDOM_OBJ_SOURCE)
  install-random: $(LIBRANDOM_OBJ_TARGET)
  
@@ -23,11 +23,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  $(LIBRANDOM_OBJ_SOURCE): random/jl_random.c random/randmtzig.c
  	cd random && \
  	$(CC) $(LIBRANDOM_CFLAGS) jl_random.c -o librandom.$(SHLIB_EXT) && \
-@@ -402,7 +393,6 @@
+@@ -422,7 +413,6 @@
  clean-random:
- 	rm -f random/librandom.$(SHLIB_EXT)
+ 	-rm -f random/librandom.$(SHLIB_EXT)
  distclean-random: clean-random
--	cd random && rm -rf *.tar.gz dsfmt-$(DSFMT_VER)
+-	-cd random && rm -rf *.tar.gz dsfmt-$(DSFMT_VER)
  
  ## OpenBLAS ##
  
diff --git a/debian/patches/do-not-download-jquery.patch b/debian/patches/do-not-download-jquery.patch
index 6caa7a4..28df7a4 100644
--- a/debian/patches/do-not-download-jquery.patch
+++ b/debian/patches/do-not-download-jquery.patch
@@ -22,7 +22,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  help:
 @@ -48,27 +44,19 @@
  	-rm -rf $(BUILDDIR)/*
- 	rm -f sphinx/*.pyc
+ 	rm -f sphinx/*.pyc helpdb.jl
  
 -clean-jquery:
 -	-rm -f $(JQUERYDEST)
diff --git a/debian/patches/dpkg-buildflags.patch b/debian/patches/dpkg-buildflags.patch
index 43f33e3..6e25ce0 100644
--- a/debian/patches/dpkg-buildflags.patch
+++ b/debian/patches/dpkg-buildflags.patch
@@ -10,16 +10,7 @@ Last-Update: 2012-11-18
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/deps/Makefile
 +++ b/deps/Makefile
-@@ -263,7 +263,7 @@
- ifeq ($(OS), WINNT) 
- UV_CFLAGS=
- else
--UV_CFLAGS = CFLAGS="-g -fPIC"
-+UV_CFLAGS = CFLAGS="$(CFLAGS) -fPIC"
- endif
- 
- UV_OBJ_TARGET = $(USRLIB)/uv.a
-@@ -314,13 +314,13 @@
+@@ -328,13 +328,13 @@
  
  ## Grisu floating-point printing library ##
  
@@ -27,15 +18,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +GRISU_OPTS = $(CXXFLAGS) -O3 -fvisibility=hidden $(fPIC)
  
  compile-double-conversion: libgrisu.$(SHLIB_EXT)
- install-double-conversion: $(USRLIB)/julia/libgrisu.$(SHLIB_EXT)
+ install-double-conversion: $(USR)/lib/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
 +	$(CXX) $(CPPFLAGS) $(GRISU_OPTS) -I/usr/include/double-conversion double_conversion_wrapper.cpp -shared $(LDFLAGS) -o libgrisu.$(SHLIB_EXT) -ldouble-conversion
- $(USRLIB)/julia/libgrisu.$(SHLIB_EXT): libgrisu.$(SHLIB_EXT)
+ $(USR)/lib/libgrisu.$(SHLIB_EXT): libgrisu.$(SHLIB_EXT)
  	cp -f $< $@
  	$(INSTALL_NAME_CMD)libgrisu.dylib $@
-@@ -384,7 +384,7 @@
+@@ -404,7 +404,7 @@
  
  $(LIBRANDOM_OBJ_SOURCE): random/jl_random.c random/randmtzig.c
  	cd random && \
@@ -44,33 +35,33 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	$(INSTALL_NAME_CMD)librandom.$(SHLIB_EXT) librandom.$(SHLIB_EXT)
  
  $(LIBRANDOM_OBJ_TARGET): $(LIBRANDOM_OBJ_SOURCE)
-@@ -628,7 +628,7 @@
+@@ -670,7 +670,7 @@
  endif
  
- $(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)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(SUITESPARSE_INC) SuiteSparse_wrapper.c -o $(USRLIB)/julia/libsuitesparse_wrapper.$(SHLIB_EXT) $(SUITESPARSE_LIB)
+ $(USR)/lib/libsuitesparse_wrapper.$(SHLIB_EXT): SuiteSparse_wrapper.c $(SUITESPARSE_OBJ_TARGET)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(SUITESPARSE_INC) SuiteSparse_wrapper.c -o $(USR)/lib/libsuitesparse_wrapper.$(SHLIB_EXT) $(SUITESPARSE_LIB)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(SUITESPARSE_INC) SuiteSparse_wrapper.c -o $(USR)/lib/libsuitesparse_wrapper.$(SHLIB_EXT) $(SUITESPARSE_LIB)
  	$(INSTALL_NAME_CMD)libsuitesparse_wrapper.$(SHLIB_EXT) $@
  	touch $@
- install-suitesparse-wrapper: $(USRLIB)/julia/libsuitesparse_wrapper.$(SHLIB_EXT)
-@@ -774,7 +774,7 @@
+ install-suitesparse-wrapper: $(USR)/lib/libsuitesparse_wrapper.$(SHLIB_EXT)
+@@ -817,7 +817,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) $(GMPW_LIB)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GMPW_INC) gmp_wrapper.c -o $(USRLIB)/julia/libgmp_wrapper.$(SHLIB_EXT) $(GMPW_LIB)
+ $(USR)/lib/libgmp_wrapper.$(SHLIB_EXT): gmp_wrapper.c $(GMP_OBJ_TARGET) | $(USR)/lib
+-	$(CC) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GMPW_INC) gmp_wrapper.c -o $(USR)/lib/libgmp_wrapper.$(SHLIB_EXT) $(RPATH_ORIGIN) $(GMPW_LIB)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GMPW_INC) gmp_wrapper.c -o $(USR)/lib/libgmp_wrapper.$(SHLIB_EXT) $(RPATH_ORIGIN) $(GMPW_LIB)
  	$(INSTALL_NAME_CMD)libgmp_wrapper.$(SHLIB_EXT) $@
  	touch $@
- install-gmp-wrapper: $(USRLIB)/julia/libgmp_wrapper.$(SHLIB_EXT)
-@@ -828,7 +828,7 @@
+ install-gmp-wrapper: $(USR)/lib/libgmp_wrapper.$(SHLIB_EXT)
+@@ -870,7 +870,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)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GLPKW_INC) glpk_wrapper.c $(GLPKW_LIB) -o $(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT)
+ $(USR)/lib/libglpk_wrapper.$(SHLIB_EXT): glpk_wrapper.c $(GLPK_OBJ_TARGET)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GLPKW_INC) glpk_wrapper.c $(GLPKW_LIB) -o $(USR)/lib/libglpk_wrapper.$(SHLIB_EXT) $(RPATH_ORIGIN)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GLPKW_INC) glpk_wrapper.c $(GLPKW_LIB) -o $(USR)/lib/libglpk_wrapper.$(SHLIB_EXT) $(RPATH_ORIGIN)
  	$(INSTALL_NAME_CMD)libglpk_wrapper.$(SHLIB_EXT) $@
  	touch $@
- install-glpk-wrapper: $(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT) glpk_wrapper.c
+ install-glpk-wrapper: $(USR)/lib/libglpk_wrapper.$(SHLIB_EXT) glpk_wrapper.c
 --- a/deps/openlibm/Make.inc
 +++ b/deps/openlibm/Make.inc
 @@ -4,12 +4,12 @@
@@ -194,7 +185,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 --- a/ui/Makefile
 +++ b/ui/Makefile
-@@ -20,9 +20,9 @@
+@@ -17,9 +17,9 @@
  	$(MAKE) julia-$@
  
  %.o: %.c repl.h
@@ -222,8 +213,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  libRmath.$(SHLIB_EXT): $(XOBJS)
  	rm -rf $@
--	$(QUIET_LINK) $(CC) -shared -o $@ $^ -L$(USRLIB)/julia -lrandom $(RPATH_ORIGIN)
-+	$(QUIET_LINK) $(CC) $(LDFLAGS) -shared -o $@ $^ -L$(USRLIB)/julia -lrandom $(RPATH_ORIGIN)
+-	$(QUIET_LINK) $(CC) -shared -o $@ $^ -L$(USR)/lib -lrandom $(RPATH_ORIGIN)
++	$(QUIET_LINK) $(CC) $(LDFLAGS) -shared -o $@ $^ -L$(USR)/lib -lrandom $(RPATH_ORIGIN)
  
  clean:
  	rm -f *.o *.do *.a *.$(SHLIB_EXT) core* *~ *#
diff --git a/debian/patches/fix-clean-rules.patch b/debian/patches/fix-clean-rules.patch
index 32b632b..075783c 100644
--- a/debian/patches/fix-clean-rules.patch
+++ b/debian/patches/fix-clean-rules.patch
@@ -4,45 +4,15 @@ Forwarded: no
 Last-Update: 2012-11-18
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/deps/Makefile
-+++ b/deps/Makefile
-@@ -346,7 +346,7 @@
- 
- clean-openlibm:
- 	$(MAKE) -C openlibm distclean
--	rm $(OPENLIBM_OBJ_TARGET)
-+	rm -f $(OPENLIBM_OBJ_TARGET)
- distclean-openlibm: clean-openlibm      
- 
- ## Rmath ##
-@@ -694,7 +694,7 @@
- 	cd libunwind-$(UNWIND_VER) && $(MAKE) install
- 
- clean-unwind:
--	$(MAKE) -C libunwind-$(UNWIND_VER) clean
-+	-$(MAKE) -C libunwind-$(UNWIND_VER) clean
- 	rm -f $(LIBUNWIND_TARGET_OBJ) $(LIBUNWIND_TARGET_SOURCE)
- 
- distclean-unwind:
-@@ -726,7 +726,7 @@
- 	touch $@
- 
- clean-lighttpd:
--	$(MAKE) -C lighttpd-$(LIGHTTPD_VER) clean
-+	-$(MAKE) -C lighttpd-$(LIGHTTPD_VER) clean
- 	rm -f $(LIGHTTPD_OBJ_TARGET)
- distclean-lighttpd:
- 	rm -rf lighttpd-$(LIGHTTPD_VER).tar.gz lighttpd-$(LIGHTTPD_VER)
 --- a/Makefile
 +++ b/Makefile
-@@ -88,7 +88,7 @@
- 	@$(MAKE) -C ui clean
- 	@$(MAKE) -C ui/webserver clean
- 	@$(MAKE) -C test/unicode clean
--	@rm -f julia-{release,debug}-{basic,readline,webserver}
+@@ -95,6 +95,7 @@
+ 			rm -f julia-$${buildtype}-$${repltype}; \
+ 		done \
+ 	done
 +	@rm -f julia
  	@rm -f *~ *# *.tar.gz
- 	@rm -fr $(BUILD)/lib/julia
+ 	@rm -fr $(BUILD)/$(JL_PRIVATE_LIBDIR)
  
 --- a/doc/Makefile
 +++ b/doc/Makefile
@@ -50,7 +20,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  clean:
  	-rm -rf $(BUILDDIR)/*
-+	rm -f sphinx/*.pyc
++	rm -f sphinx/*.pyc helpdb.jl
  
  clean-jquery:
  	-rm -f $(JQUERYDEST)
@@ -62,3 +32,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  clean:
 -	rm -f glpk_h.jl julia_message_types_h.jl
 +	rm -f glpk_h.jl webrepl_msgtypes_h.jl
+--- a/deps/libuv/config-unix.mk
++++ b/deps/libuv/config-unix.mk
+@@ -140,8 +140,10 @@
+ 	-rm -f src/unix/*.o
+ 	-rm -f src/unix/linux/*.o
+ 	-rm -rf test/run-tests.dSYM run-benchmarks.dSYM
++	-rm -f libuv.$(SOEXT)
+ 
+ distclean-platform:
+ 	-rm -f src/unix/*.o
+ 	-rm -f src/unix/linux/*.o
+ 	-rm -rf test/run-tests.dSYM run-benchmarks.dSYM
++	-rm -f libuv.$(SOEXT)
diff --git a/debian/patches/fix-cpu-detection.patch b/debian/patches/fix-cpu-detection.patch
index 00cc0fc..9cf22c7 100644
--- a/debian/patches/fix-cpu-detection.patch
+++ b/debian/patches/fix-cpu-detection.patch
@@ -19,8 +19,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 --- a/Make.inc
 +++ b/Make.inc
-@@ -13,7 +13,7 @@
- BUILD = $(USR)
+@@ -21,7 +21,7 @@
+ endif
  
  OS = $(shell uname)
 -ARCH = $(shell uname -m)
@@ -30,7 +30,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  MKLLIB = /path/to/mkl/lib/intel64
 --- a/deps/Makefile
 +++ b/deps/Makefile
-@@ -375,7 +375,7 @@
+@@ -395,7 +395,7 @@
  LIBRANDOM_OBJ_SOURCE = random/librandom.$(SHLIB_EXT)
  
  LIBRANDOM_CFLAGS = $(CFLAGS) -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
diff --git a/debian/patches/no-git.patch b/debian/patches/no-git.patch
index e956e7d..311b8c8 100644
--- a/debian/patches/no-git.patch
+++ b/debian/patches/no-git.patch
@@ -1,29 +1,29 @@
 Description: Remove calls to git in build system / runtime
 Author: Sébastien Villemot <sebastien at debian.org>
 Forwarded: not-needed
-Last-Update: 2012-11-18
+Last-Update: 2012-12-14
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/deps/Makefile
 +++ b/deps/Makefile
-@@ -269,8 +269,6 @@
- UV_OBJ_TARGET = $(USRLIB)/uv.a
- UV_OBJ_SOURCE = libuv/uv.a
+@@ -274,8 +274,6 @@
+ UV_OBJ_TARGET = $(USR)/lib/libuv.a
+ UV_OBJ_SOURCE = libuv/libuv.a
  
 -libuv/Makefile:
 -	(cd .. && git submodule init && git submodule update)
- $(UV_OBJ_SOURCE): libuv/Makefile
- 	$(MAKE) -C libuv $(UV_CFLAGS) CC="$(CC)"
- $(UV_OBJ_TARGET): $(UV_OBJ_SOURCE)
-@@ -358,8 +356,6 @@
- OPENLIBM_OBJ_TARGET = $(USRLIB)/libopenlibm.$(SHLIB_EXT)
+ ifeq (exists, $(shell [ -d libuv/.git ] && echo exists ))
+ $(UV_OBJ_SOURCE): libuv/.git/HEAD
+ endif
+@@ -372,8 +370,6 @@
+ OPENLIBM_OBJ_TARGET = $(USR)/lib/libopenlibm.$(SHLIB_EXT)
  OPENLIBM_OBJ_SOURCE = openlibm/libopenlibm.$(SHLIB_EXT)
  
 -openlibm/Makefile:
--	(cd .. && git submodule update --init)
- $(OPENLIBM_OBJ_SOURCE): openlibm/Makefile
- 	$(MAKE) -C openlibm $(OPENLIBM_FLAGS) CC="$(CC)" FC="$(FC)" USECLANG=$(USECLANG) USEGCC=$(USEGCC)
- $(OPENLIBM_OBJ_TARGET): $(OPENLIBM_OBJ_SOURCE) | $(USRLIB)
+-	(cd .. && git submodule init && git submodule update)
+ ifeq (exists, $(shell [ -d openlibm/.git ] && echo exists ))
+ $(OPENLIBM_OBJ_SOURCE): openlibm/.git/HEAD
+ endif
 --- a/Make.inc
 +++ b/Make.inc
 @@ -1,7 +1,7 @@
@@ -34,7 +34,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +JULIA_COMMIT = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^Version:.*git//')
  
  USR = $(JULIAHOME)/usr
- USRLIB = $(USR)/lib
+ USRBIN = $(USR)/bin
 --- a/base/version.jl
 +++ b/base/version.jl
 @@ -136,27 +136,8 @@
diff --git a/debian/patches/support-noopt.patch b/debian/patches/support-noopt.patch
index 7517fd5..933b292 100644
--- a/debian/patches/support-noopt.patch
+++ b/debian/patches/support-noopt.patch
@@ -7,16 +7,16 @@ Last-Update: 2012-11-18
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/Make.inc
 +++ b/Make.inc
-@@ -38,7 +38,7 @@
+@@ -46,7 +46,7 @@
  # Compiler specific stuff
  
  FC = gfortran
 -JFFLAGS = -O2 $(fPIC)
 +JFFLAGS = $(fPIC)
  
- USEGCC = 1
- USECLANG = 0
-@@ -60,7 +60,7 @@
+ ifeq ($(CC), clang)
+ USEGCC = 0
+@@ -73,7 +73,7 @@
  JCFLAGS = -std=gnu99 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
  JCXXFLAGS = -pipe $(fPIC) -fno-rtti
  DEBUGFLAGS = -ggdb3 -DDEBUG
@@ -27,7 +27,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  endif
 --- a/deps/Makefile
 +++ b/deps/Makefile
-@@ -314,7 +314,7 @@
+@@ -328,7 +328,7 @@
  
  ## Grisu floating-point printing library ##
  
@@ -35,9 +35,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +GRISU_OPTS = $(CXXFLAGS) -fvisibility=hidden $(fPIC)
  
  compile-double-conversion: libgrisu.$(SHLIB_EXT)
- install-double-conversion: $(USRLIB)/julia/libgrisu.$(SHLIB_EXT)
-@@ -374,7 +374,7 @@
- LIBRANDOM_OBJ_TARGET = $(USRLIB)/julia/librandom.$(SHLIB_EXT)
+ install-double-conversion: $(USR)/lib/libgrisu.$(SHLIB_EXT)
+@@ -394,7 +394,7 @@
+ LIBRANDOM_OBJ_TARGET = $(USR)/lib/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
@@ -45,33 +45,33 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  ifeq ($(ARCH), x86_64)
  LIBRANDOM_CFLAGS += -msse2 -DHAVE_SSE2
  endif
-@@ -628,7 +628,7 @@
+@@ -670,7 +670,7 @@
  endif
  
- $(USRLIB)/julia/libsuitesparse_wrapper.$(SHLIB_EXT): SuiteSparse_wrapper.c $(SUITESPARSE_OBJ_TARGET)
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(SUITESPARSE_INC) SuiteSparse_wrapper.c -o $(USRLIB)/julia/libsuitesparse_wrapper.$(SHLIB_EXT) $(SUITESPARSE_LIB)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $(fPIC) $(SUITESPARSE_INC) SuiteSparse_wrapper.c -o $(USRLIB)/julia/libsuitesparse_wrapper.$(SHLIB_EXT) $(SUITESPARSE_LIB)
+ $(USR)/lib/libsuitesparse_wrapper.$(SHLIB_EXT): SuiteSparse_wrapper.c $(SUITESPARSE_OBJ_TARGET)
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(SUITESPARSE_INC) SuiteSparse_wrapper.c -o $(USR)/lib/libsuitesparse_wrapper.$(SHLIB_EXT) $(SUITESPARSE_LIB)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $(fPIC) $(SUITESPARSE_INC) SuiteSparse_wrapper.c -o $(USR)/lib/libsuitesparse_wrapper.$(SHLIB_EXT) $(SUITESPARSE_LIB)
  	$(INSTALL_NAME_CMD)libsuitesparse_wrapper.$(SHLIB_EXT) $@
  	touch $@
- install-suitesparse-wrapper: $(USRLIB)/julia/libsuitesparse_wrapper.$(SHLIB_EXT)
-@@ -774,7 +774,7 @@
+ install-suitesparse-wrapper: $(USR)/lib/libsuitesparse_wrapper.$(SHLIB_EXT)
+@@ -817,7 +817,7 @@
  endif
  
- $(USRLIB)/julia/libgmp_wrapper.$(SHLIB_EXT): gmp_wrapper.c $(GMP_OBJ_TARGET) | $(USRLIB)
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GMPW_INC) gmp_wrapper.c -o $(USRLIB)/julia/libgmp_wrapper.$(SHLIB_EXT) $(GMPW_LIB)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $(fPIC) $(GMPW_INC) gmp_wrapper.c -o $(USRLIB)/julia/libgmp_wrapper.$(SHLIB_EXT) $(GMPW_LIB)
+ $(USR)/lib/libgmp_wrapper.$(SHLIB_EXT): gmp_wrapper.c $(GMP_OBJ_TARGET) | $(USR)/lib
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GMPW_INC) gmp_wrapper.c -o $(USR)/lib/libgmp_wrapper.$(SHLIB_EXT) $(RPATH_ORIGIN) $(GMPW_LIB)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $(fPIC) $(GMPW_INC) gmp_wrapper.c -o $(USR)/lib/libgmp_wrapper.$(SHLIB_EXT) $(RPATH_ORIGIN) $(GMPW_LIB)
  	$(INSTALL_NAME_CMD)libgmp_wrapper.$(SHLIB_EXT) $@
  	touch $@
- install-gmp-wrapper: $(USRLIB)/julia/libgmp_wrapper.$(SHLIB_EXT)
-@@ -828,7 +828,7 @@
+ install-gmp-wrapper: $(USR)/lib/libgmp_wrapper.$(SHLIB_EXT)
+@@ -870,7 +870,7 @@
+ 
  
- $(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT): glpk_wrapper.c $(GLPK_OBJ_TARGET)
- 	mkdir -p $(USRLIB)
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GLPKW_INC) glpk_wrapper.c $(GLPKW_LIB) -o $(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $(fPIC) $(GLPKW_INC) glpk_wrapper.c $(GLPKW_LIB) -o $(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT)
+ $(USR)/lib/libglpk_wrapper.$(SHLIB_EXT): glpk_wrapper.c $(GLPK_OBJ_TARGET)
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(GLPKW_INC) glpk_wrapper.c $(GLPKW_LIB) -o $(USR)/lib/libglpk_wrapper.$(SHLIB_EXT) $(RPATH_ORIGIN)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $(fPIC) $(GLPKW_INC) glpk_wrapper.c $(GLPKW_LIB) -o $(USR)/lib/libglpk_wrapper.$(SHLIB_EXT) $(RPATH_ORIGIN)
  	$(INSTALL_NAME_CMD)libglpk_wrapper.$(SHLIB_EXT) $@
  	touch $@
- install-glpk-wrapper: $(USRLIB)/julia/libglpk_wrapper.$(SHLIB_EXT) glpk_wrapper.c
+ install-glpk-wrapper: $(USR)/lib/libglpk_wrapper.$(SHLIB_EXT) glpk_wrapper.c
 --- a/deps/Rmath/src/Makefile
 +++ b/deps/Rmath/src/Makefile
 @@ -34,7 +34,7 @@
diff --git a/debian/patches/use-shared-llvm.patch b/debian/patches/use-shared-llvm.patch
index ea6f646..16a4bba 100644
--- a/debian/patches/use-shared-llvm.patch
+++ b/debian/patches/use-shared-llvm.patch
@@ -10,8 +10,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	-I$(shell $(LLVM_CONFIG) --includedir) \
  	-I$(JULIAHOME)/deps/libuv/include -I$(JULIAHOME)/usr/include
  
--LIBS = $(shell $(LLVM_CONFIG) --libfiles) $(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 $(OSLIBS) -lpthread $(shell $(LLVM_CONFIG) --ldflags)
+-LIBS = $(shell $(LLVM_CONFIG) --libfiles) $(WHOLE_ARCHIVE) $(JULIAHOME)/src/flisp/libflisp.a $(WHOLE_ARCHIVE) $(JULIAHOME)/src/support/libsupport.a -L$(USR)/lib $(USR)/lib/libuv.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 $(USR)/lib/libuv.a $(OSLIBS) -lpthread $(shell $(LLVM_CONFIG) --ldflags)
  
  ifneq ($(MAKECMDGOALS),debug)
  TARGET =
diff --git a/debian/patches/use-sonames-with-dlopen.patch b/debian/patches/use-sonames-with-dlopen.patch
index eb2f0ca..184b54a 100644
--- a/debian/patches/use-sonames-with-dlopen.patch
+++ b/debian/patches/use-sonames-with-dlopen.patch
@@ -10,7 +10,7 @@ Last-Update: 2012-11-18
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/Make.inc
 +++ b/Make.inc
-@@ -163,7 +163,7 @@
+@@ -174,7 +174,7 @@
  LIBBLASNAME = libblas
  else
  LIBBLAS = -lblas
@@ -18,8 +18,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +LIBBLASNAME = libblas.so.3
  endif
  else
- ifeq ($(OS), WINNT)
-@@ -181,7 +181,7 @@
+ LIBBLAS = -L$(USR)/lib -lopenblas
+@@ -187,7 +187,7 @@
  LIBLAPACKNAME = liblapack
  else
  LIBLAPACK = -llapack
@@ -30,41 +30,56 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  LIBLAPACK = $(LIBBLAS)
 --- a/base/pcre.jl
 +++ b/base/pcre.jl
-@@ -1,6 +1,6 @@
- ## low-level pcre interface ##
+@@ -4,7 +4,7 @@
  
--libpcre = dlopen("libpcre")
-+libpcre = dlopen("libpcre.so.3")
+ include("pcre_h.jl")
  
- module PCRE
- import Base.*
---- a/base/start_image.jl
-+++ b/base/start_image.jl
-@@ -6,7 +6,7 @@
- @windows_only _jl_repl = ccall(:GetModuleHandleA,stdcall,Ptr{Void},(Ptr{Void},),C_NULL)
+-const VERSION = bytestring(ccall((:pcre_version, :libpcre), Ptr{Uint8}, ()))
++const VERSION = bytestring(ccall((:pcre_version, "libpcre.so.3"), Ptr{Uint8}, ()))
  
- # Essential libraries
--libpcre = dlopen("libpcre")
-+libpcre = dlopen("libpcre.so.3")
- libgrisu = dlopen("libgrisu")
- librandom = dlopen("librandom")
- libopenlibm = dlopen("libopenlibm")
-@@ -15,8 +15,8 @@
- # Optional libraries
- const libblas = dlopen(libblas_name)
- const liblapack = (libblas_name == liblapack_name) ? libblas : dlopen(liblapack_name)
--const libfftw = dlopen("libfftw3_threads")
--const libfftwf = dlopen("libfftw3f_threads")
-+const libfftw = dlopen("libfftw3_threads.so.3")
-+const libfftwf = dlopen("libfftw3f_threads.so.3")
+ # supported options for different use cases
  
- ##_jl_libglpk = dlopen("libglpk")
- ##_jl_libglpk = dlopen("libglpk_wrapper")
+@@ -49,7 +49,7 @@
+     extra::Ptr{Void}, what::Integer, ::Type{T}
+ )
+     buf = Array(Uint8,sizeof(T))
+-    ret = ccall((:pcre_fullinfo, :libpcre), Int32,
++    ret = ccall((:pcre_fullinfo, "libpcre.so.3"), Int32,
+                 (Ptr{Void}, Ptr{Void}, Int32, Ptr{Uint8}),
+                 regex, extra, what, buf)
+     if ret != 0
+@@ -65,7 +65,7 @@
+ function compile(pattern::String, options::Integer)
+     errstr = Array(Ptr{Uint8},1)
+     erroff = Array(Int32,1)
+-    re_ptr = (()->ccall((:pcre_compile, :libpcre), Ptr{Void},
++    re_ptr = (()->ccall((:pcre_compile, "libpcre.so.3"), Ptr{Void},
+                         (Ptr{Uint8}, Int32, Ptr{Ptr{Uint8}}, Ptr{Int32}, Ptr{Uint8}),
+                         pattern, options, errstr, erroff, C_NULL))()
+     if re_ptr == C_NULL
+@@ -82,7 +82,7 @@
+ function study(regex::Array{Uint8}, options::Integer)
+     # NOTE: options should always be zero in current PCRE
+     errstr = Array(Ptr{Uint8},1)
+-    extra = (()->ccall((:pcre_study, :libpcre), Ptr{Void},
++    extra = (()->ccall((:pcre_study, "libpcre.so.3"), Ptr{Void},
+                        (Ptr{Void}, Int32, Ptr{Ptr{Uint8}}),
+                        regex, options, errstr))()
+     if errstr[1] != C_NULL
+@@ -99,7 +99,7 @@
+     end
+     ncap = info(regex, extra, INFO_CAPTURECOUNT, Int32)
+     ovec = Array(Int32, 3(ncap+1))
+-    n = ccall((:pcre_exec, :libpcre), Int32,
++    n = ccall((:pcre_exec, "libpcre.so.3"), Int32,
+               (Ptr{Void}, Ptr{Void}, Ptr{Uint8}, Int32,
+                Int32, Int32, Ptr{Int32}, Int32),
+               regex, extra, str, length(str),
 --- a/extras/glpk.jl
 +++ b/extras/glpk.jl
-@@ -8,7 +8,7 @@
+@@ -173,7 +173,7 @@
  #{{{
- load("glpk_h.jl")
+ include("$JULIA_HOME/../share/julia/extras/glpk_h.jl")
  
 -_jl_libglpk = dlopen("libglpk")
 +_jl_libglpk = dlopen("libglpk.so.0")
@@ -73,7 +88,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  macro glpk_ccall(func, args...)
 --- a/extras/strpack.jl
 +++ b/extras/strpack.jl
-@@ -506,7 +506,7 @@
+@@ -508,7 +508,7 @@
  show_struct_layout(s::Struct, strategy::DataAlign, width) = show_struct_layout(s, strategy, width, 10)
  
  ## Native layout ##
@@ -84,17 +99,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      quote
 --- a/extras/suitesparse.jl
 +++ b/extras/suitesparse.jl
-@@ -2,8 +2,8 @@
- require("suitesparse_h.jl")
+@@ -28,8 +28,8 @@
+ require("suitesparse_h")
+ 
+ const libsuitesparse_wrapper = "libsuitesparse_wrapper"
+-const libcholmod = "libcholmod"
+-const libumfpack = "libumfpack"
++const libcholmod = "libcholmod.1.7.1"
++const libumfpack = "libumfpack.so.5.4.0"
+ const libspqr = "libspqr"
  
- const _jl_libsuitesparse_wrapper = dlopen("libsuitesparse_wrapper")
--const _jl_libcholmod = dlopen("libcholmod")
--const _jl_libumfpack = dlopen("libumfpack")
-+const _jl_libcholmod = dlopen("libcholmod.so.1.7.1")
-+const _jl_libumfpack = dlopen("libumfpack.so.5.4.0")
- const _chm_aat       = dlsym(_jl_libcholmod, :cholmod_aat)
- const _chm_amd       = dlsym(_jl_libcholmod, :cholmod_amd)
- const _chm_analyze   = dlsym(_jl_libcholmod, :cholmod_analyze)
+ const _chm_aat       = (:cholmod_aat, libcholmod)
 --- a/extras/zlib_h.jl
 +++ b/extras/zlib_h.jl
 @@ -1,6 +1,6 @@
@@ -107,9 +122,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 --- a/extras/arpack.jl
 +++ b/extras/arpack.jl
-@@ -1,4 +1,4 @@
--_jl_libarpack = dlopen("libarpack")
-+_jl_libarpack = dlopen("libarpack.so.2")
+@@ -2,7 +2,7 @@
+ 
+ export eigs, svds
+ 
+-const libarpack = "libarpack"
++const libarpack = "libarpack.so.2"
  
- for (T, Tc, saupd, real_naupd, complex_naupd) in
-     ((:Float64,:Complex128,"dsaupd_","dnaupd_","znaupd_"),
+ # For a dense matrix A is ignored and At is actually A'*A
+ sarupdate{T}(A::StridedMatrix{T}, At::StridedMatrix{T}, X::StridedVector{T}) = BLAS.symv('U', one(T), At, X)
diff --git a/debian/patches/use-system-double-conversion.patch b/debian/patches/use-system-double-conversion.patch
index d466762..9f125a6 100644
--- a/debian/patches/use-system-double-conversion.patch
+++ b/debian/patches/use-system-double-conversion.patch
@@ -6,13 +6,13 @@ Last-Update: 2012-11-18
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/deps/Makefile
 +++ b/deps/Makefile
-@@ -316,36 +316,18 @@
+@@ -330,36 +330,18 @@
  
  GRISU_OPTS = -O3 -fvisibility=hidden $(fPIC)
  
 -compile-double-conversion: double-conversion-$(GRISU_VER)/src/libgrisu_.$(SHLIB_EXT)
 +compile-double-conversion: libgrisu.$(SHLIB_EXT)
- install-double-conversion: $(USRLIB)/libgrisu.$(SHLIB_EXT)
+ install-double-conversion: $(USR)/lib/libgrisu.$(SHLIB_EXT)
  
 -double-conversion-$(GRISU_VER).tar.gz:
 -	$(WGET) http://double-conversion.googlecode.com/files/double-conversion-$(GRISU_VER).tar.gz
@@ -32,18 +32,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -	$(CXX) -c $(GRISU_OPTS) -o src/strtod.o -Isrc src/strtod.cc && \
 -	$(CXX) -c $(GRISU_OPTS) -o src/libdouble-conversion.o -I.. -Isrc ../double_conversion_wrapper.cpp && \
 -	$(CXX) $(GRISU_OPTS) src/*.o -shared -dead_strip -o src/libgrisu.$(SHLIB_EXT)
--$(USRLIB)/libgrisu.$(SHLIB_EXT): double-conversion-$(GRISU_VER)/src/libgrisu.$(SHLIB_EXT)
+-$(USR)/lib/libgrisu.$(SHLIB_EXT): double-conversion-$(GRISU_VER)/src/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)
++$(USR)/lib/libgrisu.$(SHLIB_EXT): libgrisu.$(SHLIB_EXT)
  	cp -f $< $@
  	$(INSTALL_NAME_CMD)libgrisu.dylib $@
  
  clean-double-conversion:
--	rm -f double-conversion-$(GRISU_VER)/src/*.o
--	rm -f double-conversion-$(GRISU_VER)/src/libgrisu.$(SHLIB_EXT)
+-	-rm -f double-conversion-$(GRISU_VER)/src/*.o
+-	-rm -f double-conversion-$(GRISU_VER)/src/libgrisu.$(SHLIB_EXT)
 -distclean-double-conversion:
--	rm -rf double-conversion-$(GRISU_VER).tar.gz double-conversion-$(GRISU_VER)
+-	-rm -rf double-conversion-$(GRISU_VER).tar.gz double-conversion-$(GRISU_VER)
 +	rm -f libgrisu.$(SHLIB_EXT)
 +distclean-double-conversion: clean-double-conversion
  

-- 
Julia

More information about the Pkg-julia-devel mailing list