Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Hello,
Could you unblock sundials version 2.5.0-2 ? It would fix the RC bug
#700525 (fix by Christophe).
The change is basically adding -lblas -llapack -lm to LDFLAGS
debdiff attached.
Thanks
Sylvestre
diff -u sundials-2.5.0/debian/changelog sundials-2.5.0/debian/changelog
--- sundials-2.5.0/debian/changelog
+++ sundials-2.5.0/debian/changelog
@@ -1,3 +1,10 @@
+sundials (2.5.0-2) unstable; urgency=low
+
+ * debian/rules:
+ - Add -lblas -llapack -lm to LDFLAGS (closes: #700525)
+
+ -- Christophe Trophime <christophe.troph...@lncmi.cnrs.fr> Fri, 15 Feb 2013 11:40:09 +0100
+
sundials (2.5.0-1) unstable; urgency=low
* New upstream release
reverted:
--- sundials-2.5.0/debian/libsundials-cvodes1.install
+++ sundials-2.5.0.orig/debian/libsundials-cvodes1.install
@@ -1 +0,0 @@
-usr/lib/libsundials_cvodes.so.*
diff -u sundials-2.5.0/debian/rules sundials-2.5.0/debian/rules
--- sundials-2.5.0/debian/rules
+++ sundials-2.5.0/debian/rules
@@ -11,6 +11,7 @@
#LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
#CFLAGS+=$(HARDENING_CFLAGS)
#LDFLAGS+=$(HARDENING_LDFLAGS)
+LDFLAGS+=-lblas -llapack -lm
debusr := $(DEB_DESTDIR)usr
debexp = debian/libsundials-serial-dev/usr/share/doc/libsundials-serial-dev/examples
@@ -28,7 +29,7 @@
DEB_COMPRESS_EXCLUDE = .c .out .f
USCAN_DESTDIR := $(CURDIR)/../tarballs
-DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
+
# Get the appropriate paths for the installation of the Octave files
mpath = $(shell octave-config -p LOCALFCNFILEDIR)
reverted:
--- sundials-2.5.0/debian/libsundials-ida1.install
+++ sundials-2.5.0.orig/debian/libsundials-ida1.install
@@ -1 +0,0 @@
-usr/lib/libsundials_ida.so.*
reverted:
--- sundials-2.5.0/debian/libsundials-cvode0.install
+++ sundials-2.5.0.orig/debian/libsundials-cvode0.install
@@ -1 +0,0 @@
-usr/lib/libsundials_cvode.so.*
reverted:
--- sundials-2.5.0/debian/libsundials-kinsol0.install
+++ sundials-2.5.0.orig/debian/libsundials-kinsol0.install
@@ -1 +0,0 @@
-usr/lib/libsundials_kinsol.so.*
diff -u sundials-2.5.0/debian/patches/series sundials-2.5.0/debian/patches/series
--- sundials-2.5.0/debian/patches/series
+++ sundials-2.5.0/debian/patches/series
@@ -1,4 +1,6 @@
+cmake.patch
makefile.patch
#sh4.patch
fix-format-error.patch
octave-sundialstb.patch
+sundials-config.patch
only in patch2:
unchanged:
--- sundials-2.5.0.orig/debian/patches/sundials-config.patch
+++ sundials-2.5.0/debian/patches/sundials-config.patch
@@ -0,0 +1,34 @@
+Index: sundials-2.5.0/bin/sundials-config.in
+===================================================================
+--- sundials-2.5.0.orig/bin/sundials-config.in 2012-04-12 02:31:04.000000000 +0200
++++ sundials-2.5.0/bin/sundials-config.in 2012-07-16 17:18:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! @SHELL@
++#! /bin/bash
+ # -----------------------------------------------------------------------------------
+
+ NAME_="sundials-config"
+@@ -65,7 +65,7 @@
+ abs_includedir=`cd "${includedir}" > /dev/null 2>&1 && pwd`;
+ abs_libdir=`cd "${libdir}" > /dev/null 2>&1 && pwd`;
+
+-if test $abs_includedir != /usr/include ; then
++if test "$abs_includedir" != "/usr/include" ; then
+ includes=-I$abs_includedir
+ fi
+
+Index: sundials-2.5.0/CMakeLists.txt
+===================================================================
+--- sundials-2.5.0.orig/CMakeLists.txt 2012-07-16 16:21:00.000000000 +0200
++++ sundials-2.5.0/CMakeLists.txt 2012-07-16 17:12:04.000000000 +0200
+@@ -516,6 +516,10 @@
+ ${PROJECT_SOURCE_DIR}/include/sundials/sundials_config.in
+ ${PROJECT_BINARY_DIR}/include/sundials/sundials_config.h
+ )
++CONFIGURE_FILE(
++ ${PROJECT_SOURCE_DIR}/bin/sundials-config.in
++ ${PROJECT_SOURCE_DIR}/bin/sundials-config
++ )
+
+ # Add the include directory in the source tree and the one in
+ # the binary tree (for the header file sundials_config.h)
only in patch2:
unchanged:
--- sundials-2.5.0.orig/debian/patches/cmake.patch
+++ sundials-2.5.0/debian/patches/cmake.patch
@@ -0,0 +1,111 @@
+Index: sundials-2.5.0/CMakeLists.txt
+===================================================================
+--- sundials-2.5.0.orig/CMakeLists.txt 2012-07-09 16:10:55.000000000 +0200
++++ sundials-2.5.0/CMakeLists.txt 2012-07-09 16:14:25.000000000 +0200
+@@ -18,7 +18,7 @@
+
+ # Require a fairly recent cmake version
+
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.2)
++CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+ # Project SUNDIALS (initially only C supported)
+
+@@ -28,9 +28,9 @@
+
+ SET(PACKAGE_BUGREPORT "r...@llnl.gov")
+ SET(PACKAGE_NAME "SUNDIALS")
+-SET(PACKAGE_STRING "SUNDIALS 2.4.0")
++SET(PACKAGE_STRING "SUNDIALS 2.5.0")
+ SET(PACKAGE_TARNAME "sundials")
+-SET(PACKAGE_VERSION "2.4.0")
++SET(PACKAGE_VERSION "2.5.0")
+
+ # Prohibit in-source build
+
+@@ -229,6 +229,7 @@
+
+ IF(UNIX)
+ OPTION(USE_GENERIC_MATH "Use generic (std-c) math libraries" ON)
++ MESSAGE(STATUS "Use generic (std-c) math libraries")
+ IF(USE_GENERIC_MATH)
+ # executables will be linked against -lm
+ SET(EXTRA_LINK_LIBS -lm)
+Index: sundials-2.5.0/config/SundialsLapack.cmake
+===================================================================
+--- sundials-2.5.0.orig/config/SundialsLapack.cmake 2012-07-09 16:10:55.000000000 +0200
++++ sundials-2.5.0/config/SundialsLapack.cmake 2012-07-09 16:14:55.000000000 +0200
+@@ -31,9 +31,9 @@
+ endif(NOT LAPACK_LIBRARIES)
+ # If using a GNU C compiler, it is quite likely we'll want LAPACK_LINKER_FLAGS
+ # to include -lg2c (if not already present)
+-if(CMAKE_COMPILER_IS_GNUCC AND NOT LAPACK_LINKER_FLAGS MATCHES "g2c")
+- set(LAPACK_LINKER_FLAGS "${LAPACK_LINKER_FLAGS} -lg2c")
+-endif(CMAKE_COMPILER_IS_GNUCC AND NOT LAPACK_LINKER_FLAGS MATCHES "g2c")
++if(CMAKE_COMPILER_IS_GNUCC AND NOT LAPACK_LINKER_FLAGS MATCHES "gfortran")
++ set(LAPACK_LINKER_FLAGS "${LAPACK_LINKER_FLAGS} -lgfortran")
++endif(CMAKE_COMPILER_IS_GNUCC AND NOT LAPACK_LINKER_FLAGS MATCHES "gfortran")
+ # If we have the LAPACK libraries, test them
+ if(LAPACK_LIBRARIES)
+ message(STATUS "Looking for LAPACK libraries... OK")
+@@ -69,7 +69,9 @@
+ "}\n")
+ # Attempt to link the "ltest" executable
+ try_compile(LTEST_OK ${LapackTest_DIR} ${LapackTest_DIR}
+- ltest OUTPUT_VARIABLE MY_OUTPUT)
++ ltest
++ LINK_LIBRARIES ${LAPACK_LIBRARIES}
++ OUTPUT_VARIABLE MY_OUTPUT)
+ # To ensure we do not use stuff from the previous attempts,
+ # we must remove the CMakeFiles directory.
+ file(REMOVE_RECURSE ${LapackTest_DIR}/CMakeFiles)
+Index: sundials-2.5.0/config/SundialsFortran.cmake
+===================================================================
+--- sundials-2.5.0.orig/config/SundialsFortran.cmake 2012-07-09 16:10:55.000000000 +0200
++++ sundials-2.5.0/config/SundialsFortran.cmake 2012-07-09 16:14:25.000000000 +0200
+@@ -52,6 +52,7 @@
+ # and an executable "ftest"
+ file(WRITE ${FortranTest_DIR}/CMakeLists.txt
+ "PROJECT(ftest Fortran)\n"
++ "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)\n"
+ "SET(CMAKE_VERBOSE_MAKEFILE ON)\n"
+ "SET(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\")\n"
+ "SET(CMAKE_Fortran_FLAGS \"${CMAKE_Fortran_FLAGS}\")\n"
+@@ -90,6 +91,7 @@
+ # Overwrite CMakeLists.txt with one which will generate the "ctest1" executable
+ file(WRITE ${FortranTest_DIR}/CMakeLists.txt
+ "PROJECT(ctest1 C)\n"
++ "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)\n"
+ "SET(CMAKE_VERBOSE_MAKEFILE ON)\n"
+ "SET(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\")\n"
+ "SET(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS}\")\n"
+@@ -134,6 +136,7 @@
+ # Practically a duplicate of the previous steps.
+ file(WRITE ${FortranTest_DIR}/CMakeLists.txt
+ "PROJECT(ctest2 C)\n"
++ "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)\n"
+ "SET(CMAKE_VERBOSE_MAKEFILE ON)\n"
+ "SET(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\")\n"
+ "SET(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS}\")\n"
+Index: sundials-2.5.0/config/FindLAPACK.cmake
+===================================================================
+--- sundials-2.5.0.orig/config/FindLAPACK.cmake 2012-07-09 16:10:55.000000000 +0200
++++ sundials-2.5.0/config/FindLAPACK.cmake 2012-07-09 16:14:25.000000000 +0200
+@@ -30,7 +30,7 @@
+ check_fortran_function_exists(cheev LAPACK_BLAS_WORKS)
+ mark_as_advanced(LAPACK_BLAS_WORKS)
+ if(LAPACK_BLAS_WORKS)
+- set(LAPACK_FOUND TRUE)
++ #???set(LAPACK_FOUND TRUE)
+ set(LAPACK_LIBRARIES ${BLAS_LIBRARIES})
+ endif(LAPACK_BLAS_WORKS)
+ # Generic LAPACK library?
+@@ -81,7 +81,7 @@
+
+ if(NOT LAPACK_FIND_QUIETLY)
+ if(LAPACK_FOUND)
+- message(STATUS "A library with LAPACK API found.")
++ message(STATUS "A library with LAPACK API found ${LAPACK_LIBRARIES}")
+ else(LAPACK_FOUND)
+ if(LAPACK_FIND_REQUIRED)
+ message(FATAL_ERROR
