[sundials] 40/76: Merge changes from Wheezy branch
Andreas Tille
tille at debian.org
Sun Feb 5 18:44:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository sundials.
commit 460590bc4e6742e38e3f4ede323c9b3b4c655b2b
Author: Sébastien Villemot <sebastien at debian.org>
Date: Wed Feb 27 16:33:36 2013 +0000
Merge changes from Wheezy branch
---
debian/changelog | 15 +++++
debian/control | 6 +-
debian/patches/link-blas-lapack.patch | 104 ++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 1 -
5 files changed, 124 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9f412aa..b31f5ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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:
diff --git a/debian/control b/debian/control
index ab87296..556e9e9 100644
--- a/debian/control
+++ b/debian/control
@@ -105,7 +105,9 @@ Description: MPI vector operations library (SUNDIALS library)
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 @@ Description: SUNDIALS examples files
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
diff --git a/debian/patches/link-blas-lapack.patch b/debian/patches/link-blas-lapack.patch
new file mode 100644
index 0000000..8b7bc53
--- /dev/null
+++ b/debian/patches/link-blas-lapack.patch
@@ -0,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
diff --git a/debian/patches/series b/debian/patches/series
index 85b2131..ae92893 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ makefile.patch
fix-format-error.patch
octave-sundialstb.patch
sundials-config.patch
+link-blas-lapack.patch
diff --git a/debian/rules b/debian/rules
index 7d9945e..6dab794 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@ CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sundials.git
More information about the debian-science-commits
mailing list