[Pkg-julia-devel] [SCM] Julia branch, master, updated. debian/0.0.0+20121102.git63e93f2-1-12-g9bf4cc1

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 2a2188f5b483689a5cb4e51681768c546c77765f
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Dec 18 12:42:35 2012 +0100

    New patches:
    
     + do-not-download-patchelf.patch
     + ld-library-path-for-testing.patch
     + dpkg-multiarch.patch
     + libjulia-release-drop-soname.patch

diff --git a/debian/patches/do-not-download-patchelf.patch b/debian/patches/do-not-download-patchelf.patch
new file mode 100644
index 0000000..6819084
--- /dev/null
+++ b/debian/patches/do-not-download-patchelf.patch
@@ -0,0 +1,18 @@
+Description: Do not download patchelf
+ We don't need it for the Debian package.
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-12-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/deps/Makefile
++++ b/deps/Makefile
+@@ -17,7 +17,7 @@
+ STAGE3_DEPS = suitesparse-wrapper
+ 
+ ifeq ($(OS), Linux)
+-STAGE1_DEPS += unwind patchelf
++STAGE1_DEPS += unwind
+ endif
+ 
+ ifeq ($(OS), FreeBSD)
diff --git a/debian/patches/dpkg-multiarch.patch b/debian/patches/dpkg-multiarch.patch
new file mode 100644
index 0000000..723418c
--- /dev/null
+++ b/debian/patches/dpkg-multiarch.patch
@@ -0,0 +1,18 @@
+Description: Use dpkg-architecture to determine multiarch tuple
+ This is the canonical way on Debian, rather than using gcc -print-multiarch.
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-12-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Make.inc
++++ b/Make.inc
+@@ -15,7 +15,7 @@
+ 
+ # If we're on debian, default to arch-dependent library dirs
+ ifeq ($(MULTIARCH_INSTALL), 1)
+-MULTIARCH = $(shell gcc -print-multiarch)
++MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+ JL_PRIVATE_LIBDIR = lib/$(MULTIARCH)/julia
+ JL_LIBDIR = lib/$(MULTIARCH)/
+ endif
diff --git a/debian/patches/ld-library-path-for-testing.patch b/debian/patches/ld-library-path-for-testing.patch
new file mode 100644
index 0000000..c239dd8
--- /dev/null
+++ b/debian/patches/ld-library-path-for-testing.patch
@@ -0,0 +1,21 @@
+Description: Use correct dynamic loading path when running tests
+ When Julia is compiled with MULTIARCH_INSTALL=1, the libraries are still under
+ usr/lib in the build directory. Hence they cannot be found when Julia is run
+ in place, for example when running the tests. This patch forces the right path
+ by using LD_LIBRARY_PATH.
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: no
+Last-Update: 2012-12-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Make.inc
++++ b/Make.inc
+@@ -322,7 +322,7 @@
+ ifeq ($(OS), WINNT)
+ JULIA_EXECUTABLE = $(JULIA_EXECUTABLE_release)
+ else
+-JULIA_EXECUTABLE = $(JULIAHOME)/julia
++JULIA_EXECUTABLE = LD_LIBRARY_PATH=$(BUILD)/lib $(JULIAHOME)/julia
+ endif
+ 
+ 
diff --git a/debian/patches/libjulia-release-drop-soname.patch b/debian/patches/libjulia-release-drop-soname.patch
new file mode 100644
index 0000000..4e59a8c
--- /dev/null
+++ b/debian/patches/libjulia-release-drop-soname.patch
@@ -0,0 +1,24 @@
+Description: Do not give a SONAME to libjulia-release.so
+ Otherwise the fact that this SONAME is unversioned confuses dpkg-shlibdeps and
+ dh_makeshlibs. And we don't want a versioned SONAME for now, the API is not
+ stabilized.
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: no
+Last-Update: 2012-12-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -77,11 +77,7 @@
+ 	$(QUIET_LINK) ar -rcs $@ $(DOBJS)
+ libjulia-debug: $(USR)/$(JL_LIBDIR)/libjulia-debug.$(SHLIB_EXT)
+ 
+-ifeq ($(SHLIB_EXT), so)
+-  SONAME = -Wl,-soname=libjulia-release.so
+-else
+-  SONAME =
+-endif
++SONAME = 
+ 
+ $(USR)/$(JL_LIBDIR)/libjulia-release.$(SHLIB_EXT): julia.expmap $(OBJS) flisp/libflisp.a support/libsupport.a
+ 	$(QUIET_LINK) $(CXX) $(SHIPFLAGS) $(OBJS) $(LIBS) -shared -o $@ $(LDFLAGS) $(SONAME)
diff --git a/debian/patches/series b/debian/patches/series
index 7e4e069..1e619c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,7 @@ use-sonames-with-dlopen.patch
 dpkg-buildflags.patch
 support-noopt.patch
 fix-cpu-detection.patch
+do-not-download-patchelf.patch
+ld-library-path-for-testing.patch
+dpkg-multiarch.patch
+libjulia-release-drop-soname.patch

-- 
Julia