r45612 - in /packages/sundials/trunk/debian: changelog control patches/link-blas-lapack.patch patches/series rules

sebastien at users.alioth.debian.org sebastien at users.alioth.debian.org
Wed Feb 27 16:33:36 UTC 2013 

Author: sebastien
Date: Wed Feb 27 16:33:36 2013
New Revision: 45612

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45612
Log:
Merge changes from Wheezy branch

Added:
    packages/sundials/trunk/debian/patches/link-blas-lapack.patch
Modified:
    packages/sundials/trunk/debian/changelog
    packages/sundials/trunk/debian/control
    packages/sundials/trunk/debian/patches/series
    packages/sundials/trunk/debian/rules

Modified: packages/sundials/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/changelog?rev=45612&op=diff
==============================================================================
--- packages/sundials/trunk/debian/changelog (original)
+++ packages/sundials/trunk/debian/changelog Wed Feb 27 16:33:36 2013
@@ -1,3 +1,18 @@
+sundials (2.5.0-3) unstable; urgency=low
+
+  * Team upload.
+  * Revert changes from experimental version which inadvertently made it into
+    the previous upload.
+  * Improve the fix for missing BLAS and LAPACK dependencies (closes: #700525)
+    + no longer pass BLAS and LAPACK through LDFLAGS
+    + link-blas-lapack.patch: new patch which rather adds the dependencies at
+      the libtool link level
+    + add missing dependency of libsundials-serial-dev on libblas-dev and
+      liblapack-dev
+  * Fix the dependency of octave-sundials on octave.
+
+ -- Sébastien Villemot <sebastien at debian.org>  Wed, 27 Feb 2013 16:58:32 +0100
+
 sundials (2.5.0-2) unstable; urgency=low
 
   * debian/rules:

Modified: packages/sundials/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/control?rev=45612&op=diff
==============================================================================
--- packages/sundials/trunk/debian/control (original)
+++ packages/sundials/trunk/debian/control Wed Feb 27 16:33:36 2013
@@ -105,7 +105,9 @@
 Package: libsundials-serial-dev
 Section: libdevel
 Architecture: any
-Depends: libsundials-serial (= ${binary:Version}), ${misc:Depends}
+Depends: libsundials-serial (= ${binary:Version}), ${misc:Depends},
+ libblas-dev | libatlas-base-dev | libopenblas-dev,
+ liblapack-dev | libatlas-base-dev
 Recommends: libsundials-serial-dbg
 Description: SUNDIALS development files
  The family of solvers referred to as SUNDIALS (SUite of Nonlinear and
@@ -150,7 +152,7 @@
 
 Package: octave-sundials
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, octave
 Recommends: libsundials-serial-dev
 Description: SUNDIALS  for octave
  The family of solvers referred to as SUNDIALS (SUite of Nonlinear and

Added: packages/sundials/trunk/debian/patches/link-blas-lapack.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/patches/link-blas-lapack.patch?rev=45612&op=file
==============================================================================
--- packages/sundials/trunk/debian/patches/link-blas-lapack.patch (added)
+++ packages/sundials/trunk/debian/patches/link-blas-lapack.patch Wed Feb 27 16:33:36 2013
@@ -1,0 +1,104 @@
+Description: Ensure that libraries are linked against BLAS and LAPACK when needed
+ In particular, this ensures that the shared libraries packages have correct
+ dependencies.
+Author: Sébastien Villemot <sebastien at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700525
+Forwarded: no
+Last-Update: 2013-02-27
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/cvode/Makefile.in
++++ b/src/cvode/Makefile.in
+@@ -42,6 +42,7 @@
+ LIBS     = @LIBS@
+ 
+ LAPACK_ENABLED = @LAPACK_ENABLED@
++BLAS_LAPACK_LIBS = @BLAS_LAPACK_LIBS@
+ 
+ top_srcdir = $(srcdir)/../..
+ 
+@@ -88,7 +89,7 @@
+ 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(CVODE_LIB) $(CVODE_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+ 
+ lib_with_bl: shared $(CVODE_LIB_FILES) $(CVODE_BL_LIB_FILES)
+-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(CVODE_LIB) $(CVODE_LIB_FILES)  $(CVODE_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(CVODE_LIB) $(CVODE_LIB_FILES)  $(CVODE_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) $(BLAS_LAPACK_LIBS) -version-info $(LIB_REVISION)
+ 
+ install: $(CVODE_LIB)
+ 	$(mkinstalldirs) $(includedir)/cvode
+--- a/src/cvodes/Makefile.in
++++ b/src/cvodes/Makefile.in
+@@ -42,6 +42,7 @@
+ LIBS     = @LIBS@
+ 
+ LAPACK_ENABLED = @LAPACK_ENABLED@
++BLAS_LAPACK_LIBS = @BLAS_LAPACK_LIBS@
+ 
+ top_srcdir = $(srcdir)/../..
+ 
+@@ -88,7 +89,7 @@
+ 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(CVODES_LIB) $(CVODES_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+ 
+ lib_with_bl: shared $(CVODES_LIB_FILES) $(CVODES_BL_LIB_FILES)
+-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(CVODES_LIB) $(CVODES_LIB_FILES) $(CVODES_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(CVODES_LIB) $(CVODES_LIB_FILES) $(CVODES_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) $(BLAS_LAPACK_LIBS) -version-info $(LIB_REVISION)
+ 
+ install: $(CVODES_LIB)
+ 	$(mkinstalldirs) $(includedir)/cvodes
+--- a/src/ida/Makefile.in
++++ b/src/ida/Makefile.in
+@@ -42,6 +42,7 @@
+ LIBS     = @LIBS@
+ 
+ LAPACK_ENABLED = @LAPACK_ENABLED@
++BLAS_LAPACK_LIBS = @BLAS_LAPACK_LIBS@
+ 
+ top_srcdir = $(srcdir)/../..
+ 
+@@ -88,7 +89,7 @@
+ 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(IDA_LIB) $(IDA_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+ 
+ lib_with_bl: shared $(IDA_LIB_FILES) $(IDA_BL_LIB_FILES)
+-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(IDA_LIB) $(IDA_LIB_FILES) $(IDA_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(IDA_LIB) $(IDA_LIB_FILES) $(IDA_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) $(BLAS_LAPACK_LIBS) -version-info $(LIB_REVISION)
+ 
+ install: $(IDA_LIB)
+ 	$(mkinstalldirs) $(includedir)/ida
+--- a/src/idas/Makefile.in
++++ b/src/idas/Makefile.in
+@@ -42,6 +42,7 @@
+ LIBS     = @LIBS@
+ 
+ LAPACK_ENABLED = @LAPACK_ENABLED@
++BLAS_LAPACK_LIBS = @BLAS_LAPACK_LIBS@
+ 
+ top_srcdir = $(srcdir)/../..
+ 
+@@ -88,7 +89,7 @@
+ 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(IDAS_LIB) $(IDAS_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+ 
+ lib_with_bl: shared $(IDAS_LIB_FILES) $(IDAS_BL_LIB_FILES)
+-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(IDAS_LIB) $(IDAS_LIB_FILES) $(IDAS_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(IDAS_LIB) $(IDAS_LIB_FILES) $(IDAS_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) $(BLAS_LAPACK_LIBS) -version-info $(LIB_REVISION)
+ 
+ install: $(IDAS_LIB)
+ 	$(mkinstalldirs) $(includedir)/idas
+--- a/src/kinsol/Makefile.in
++++ b/src/kinsol/Makefile.in
+@@ -42,6 +42,7 @@
+ LIBS     = @LIBS@
+ 
+ LAPACK_ENABLED = @LAPACK_ENABLED@
++BLAS_LAPACK_LIBS = @BLAS_LAPACK_LIBS@
+ 
+ top_srcdir = $(srcdir)/../..
+ 
+@@ -88,7 +89,7 @@
+ 	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(KINSOL_LIB) $(KINSOL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
+ 
+ lib_with_bl: shared $(KINSOL_LIB_FILES) $(KINSOL_BL_LIB_FILES)
+-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(KINSOL_LIB) $(KINSOL_LIB_FILES) $(KINSOL_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) -version-info $(LIB_REVISION)
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $(KINSOL_LIB) $(KINSOL_LIB_FILES) $(KINSOL_BL_LIB_FILES) $(SHARED_LIB_FILES) -rpath $(libdir) $(LDFLAGS) $(LIBS) $(BLAS_LAPACK_LIBS) -version-info $(LIB_REVISION)
+ 
+ install: $(KINSOL_LIB)
+ 	$(mkinstalldirs) $(includedir)/kinsol

Modified: packages/sundials/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/patches/series?rev=45612&op=diff
==============================================================================
--- packages/sundials/trunk/debian/patches/series (original)
+++ packages/sundials/trunk/debian/patches/series Wed Feb 27 16:33:36 2013
@@ -4,3 +4,4 @@
 fix-format-error.patch
 octave-sundialstb.patch
 sundials-config.patch
+link-blas-lapack.patch

Modified: packages/sundials/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/sundials/trunk/debian/rules?rev=45612&op=diff
==============================================================================
--- packages/sundials/trunk/debian/rules (original)
+++ packages/sundials/trunk/debian/rules Wed Feb 27 16:33:36 2013
@@ -7,7 +7,6 @@
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
 CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=-lblas -llapack -lm
 
 
 #workaround to start MPI-applications in chroot

More information about the debian-science-commits mailing list