[SCM] linbox: library for exact linear algebra branch, master, updated. upstream/1.3.2-46-ga44ac6b

Lifeng Sun lifongsun at gmail.com
Fri Jul 19 03:15:31 UTC 2013


The following commit has been merged in the master branch:
commit f931a9e1a26de662bd780709a7046f49b33b73b8
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sat Jul 6 18:54:27 2013 +0800

    fix gmp detection.

diff --git a/debian/patches/fix-gmp-detect.patch b/debian/patches/fix-gmp-detect.patch
new file mode 100644
index 0000000..748e6b7
--- /dev/null
+++ b/debian/patches/fix-gmp-detect.patch
@@ -0,0 +1,23 @@
+fix GMP detection.
+
+--- a/macros/gmp-check.m4
++++ b/macros/gmp-check.m4
+@@ -53,15 +53,10 @@
+ 
+ for GMP_HOME in ${GMP_HOME_PATH}
+   do
+-	if test -r "$GMP_HOME/include/gmp.h"; then
++	if test -r "$GMP_HOME/include/${DEB_HOST_MULTIARCH}/gmp.h"; then
+ 
+-		if test "x$GMP_HOME" != "x/usr" -a "x$GMP_HOME" != "x/usr/local"; then
+-			GMP_CFLAGS="-I${GMP_HOME}/include"
+-			GMP_LIBS="-L${GMP_HOME}/lib -lgmpxx -lgmp"
+-		else
+-			GMP_CFLAGS=
+-			GMP_LIBS="-lgmpxx -lgmp"
+-		fi
++		GMP_CFLAGS="-I${GMP_HOME}/include/${DEB_HOST_MULTIARCH}"
++		GMP_LIBS="-L${GMP_HOME}/lib/${DEB_HOST_MULTIARCH} -lgmpxx -lgmp"
+ 
+ 		CXXFLAGS="${CXXFLAGS} ${GMP_CFLAGS}"
+ 		LIBS="${LIBS} ${GMP_LIBS}"
diff --git a/debian/patches/series b/debian/patches/series
index 8020f62..a41b4f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 example.patch
 soname.patch
 fix-doc-path.patch
+fix-gmp-detect.patch
diff --git a/debian/rules b/debian/rules
index e357fa6..21855a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		--prefix=/usr \
 		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
-		--with-gmp \
+		--with-gmp=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		--with-givaro \
 		--with-blas \
 		--with-ntl \

-- 
linbox: library for exact linear algebra



More information about the debian-science-commits mailing list