[SCM] linbox: library for exact linear algebra branch, master, updated. debian/1.1.6_rc0-4.1-8-g9d2c312

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 2ca5afb005acc13b58f86c4841f944e31aba30d1
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Aug 9 18:14:38 2011 +0800

    Fix multiarch library path of NTL.

diff --git a/debian/patches/multiarch-libntl.patch b/debian/patches/multiarch-libntl.patch
new file mode 100644
index 0000000..9c07481
--- /dev/null
+++ b/debian/patches/multiarch-libntl.patch
@@ -0,0 +1,13 @@
+diff --git a/macros/sage-check.m4 b/macros/sage-check.m4
+index eb12be4..e190253 100644
+--- a/macros/sage-check.m4
++++ b/macros/sage-check.m4
+@@ -17,7 +17,7 @@ if test "x$HAVE_NTL" = "xyes" ; then
+ dnl  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+ AC_MSG_CHECKING([whether NTL was built with -fPIC])
+ res=yes;
+-$OBJDUMP --reloc $NTL_HOME/lib/libntl.a | $EGREP '(GOT|PLT|JU?MP_SLOT)' >/dev/null || res=no
++$OBJDUMP --reloc /usr/lib/$DEB_HOST_MULTIARCH/libntl.a | $EGREP '(GOT|PLT|JU?MP_SLOT)' >/dev/null || res=no
+ if test "x$res" = "xno" ; then
+ 	AC_MSG_RESULT(no)
+ 	echo
diff --git a/debian/patches/series b/debian/patches/series
index 308e69f..fd77597 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 commentator.patch
+multiarch-libntl.patch
diff --git a/debian/rules b/debian/rules
index aaec165..75a6c79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,11 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
+DEB_HOST_MULTIARCH      ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_CONFIGURE_EXTRA_FLAGS += --with-gmp --with-givaro --with-blas --with-ntl --enable-optimization --enable-docs --enable-sage --enable-shared
 
+export DEB_HOST_MULTIARCH
+
 common-build-arch common-build-indep:: debian/stamp-makefile-build-doc
 debian/stamp-makefile-build-doc:
 	+$(DEB_MAKE_INVOKE) docs

-- 
linbox: library for exact linear algebra