[sundials] 76/76: enable multi-arch (patch provided by James Tocknell)

Andreas Tille tille at debian.org
Sun Feb 5 18:45:04 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 65995ca27c835fb302571878b4bacb420770289a
Author: Andreas Tille <tille at debian.org>
Date:   Sun Feb 5 16:54:33 2017 +0100

    enable multi-arch (patch provided by James Tocknell)
---
 debian/control                                     |  10 +
 .../patches/Fix-library-paths-for-multiarch.patch  | 359 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 3 files changed, 370 insertions(+)

diff --git a/debian/control b/debian/control
index ada97e8..8e52de4 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Homepage: http://www.llnl.gov/CASC/sundials/
 
 Package: libsundials-arkode1
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: differential equation solver (SUNDIALS library)
@@ -27,6 +28,7 @@ Description: differential equation solver (SUNDIALS library)
 
 Package: libsundials-cvode2
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: ordinary differential equation solver (SUNDIALS library)
@@ -37,6 +39,7 @@ Description: ordinary differential equation solver (SUNDIALS library)
 
 Package: libsundials-cvodes2
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: ODE solver with sensistivity analysis (SUNDIALS library)
@@ -49,6 +52,7 @@ Description: ODE solver with sensistivity analysis (SUNDIALS library)
 
 Package: libsundials-ida2
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: differential-algebraic system solver (SUNDIALS library)
@@ -58,6 +62,7 @@ Description: differential-algebraic system solver (SUNDIALS library)
 
 Package: libsundials-idas1
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: IDA solver with sensitivity capabilities (SUNDIALS library)
@@ -67,6 +72,7 @@ Description: IDA solver with sensitivity capabilities (SUNDIALS library)
 
 Package: libsundials-kinsol2
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: KINSOL solver (SUNDIALS library)
@@ -76,6 +82,7 @@ Description: KINSOL solver (SUNDIALS library)
 
 Package: libsundials-nvecserial2
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: vector operations library (SUNDIALS library)
@@ -86,6 +93,7 @@ Description: vector operations library (SUNDIALS library)
 
 Package: libsundials-nvecparallel2
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          mpi-default-run
@@ -97,6 +105,7 @@ Description: MPI vector operations library (SUNDIALS library)
 
 Package: libsundials-serial-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libsundials-serial (= ${binary:Version}),
          ${misc:Depends},
@@ -115,6 +124,7 @@ Description: SUNDIALS development files
 
 Package: libsundials-nvecparallel-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libsundials-nvecparallel2 (= ${binary:Version}),
          ${misc:Depends}
diff --git a/debian/patches/Fix-library-paths-for-multiarch.patch b/debian/patches/Fix-library-paths-for-multiarch.patch
new file mode 100644
index 0000000..a4d7007
--- /dev/null
+++ b/debian/patches/Fix-library-paths-for-multiarch.patch
@@ -0,0 +1,359 @@
+From: James Tocknell <aragilar at gmail.com>
+Date: Wed, 14 Oct 2015 01:02:58 +1100
+Subject: Fix library paths for multiarch
+
+---
+ CMakeLists.txt                   | 6 +++++-
+ src/arkode/CMakeLists.txt        | 4 ++--
+ src/arkode/fcmix/CMakeLists.txt  | 2 +-
+ src/cvode/CMakeLists.txt         | 4 ++--
+ src/cvode/fcmix/CMakeLists.txt   | 2 +-
+ src/cvodes/CMakeLists.txt        | 4 ++--
+ src/ida/CMakeLists.txt           | 4 ++--
+ src/ida/fcmix/CMakeLists.txt     | 2 +-
+ src/idas/CMakeLists.txt          | 4 ++--
+ src/kinsol/CMakeLists.txt        | 4 ++--
+ src/kinsol/fcmix/CMakeLists.txt  | 2 +-
+ src/nvec_openmp/CMakeLists.txt   | 8 ++++----
+ src/nvec_par/CMakeLists.txt      | 8 ++++----
+ src/nvec_pthreads/CMakeLists.txt | 8 ++++----
+ src/nvec_ser/CMakeLists.txt      | 8 ++++----
+ 15 files changed, 37 insertions(+), 33 deletions(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,7 @@
+ 
+ # Require a fairly recent cmake version
+ 
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.1)
++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
+ 
+ # Set CMake policy to allow examples to build
+ if(COMMAND cmake_policy)
+@@ -34,6 +34,10 @@ endif(COMMAND cmake_policy)
+ 
+ PROJECT(sundials C)
+ 
++# Get correct build paths automatically
++
++INCLUDE(GNUInstallDirs)
++
+ # Set some variables with info on the SUNDIALS project
+ 
+ SET(PACKAGE_BUGREPORT "woodward6 at llnl.gov")
+--- a/src/arkode/CMakeLists.txt
++++ b/src/arkode/CMakeLists.txt
+@@ -127,7 +127,7 @@ IF(BUILD_STATIC_LIBS)
+     PROPERTIES OUTPUT_NAME sundials_arkode CLEAN_DIRECT_OUTPUT 1)
+ 
+   # Install the ARKODE library
+-  INSTALL(TARGETS sundials_arkode_static DESTINATION lib)
++  INSTALL(TARGETS sundials_arkode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ENDIF(BUILD_STATIC_LIBS)
+ 
+@@ -149,7 +149,7 @@ IF(BUILD_SHARED_LIBS)
+   TARGET_LINK_LIBRARIES(sundials_arkode_shared -lm -llapack -lblas)
+ 
+   # Install the ARKODE library
+-  INSTALL(TARGETS sundials_arkode_shared DESTINATION lib)
++  INSTALL(TARGETS sundials_arkode_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+--- a/src/arkode/fcmix/CMakeLists.txt
++++ b/src/arkode/fcmix/CMakeLists.txt
+@@ -70,7 +70,7 @@ SET_TARGET_PROPERTIES(sundials_farkode_s
+   PROPERTIES OUTPUT_NAME sundials_farkode CLEAN_DIRECT_OUTPUT 1)
+ 
+ # Install the FARKODE library
+-INSTALL(TARGETS sundials_farkode_static DESTINATION lib)
++INSTALL(TARGETS sundials_farkode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ #
+ MESSAGE(STATUS "Added ARKODE FCMIX module")
+--- a/src/cvode/CMakeLists.txt
++++ b/src/cvode/CMakeLists.txt
+@@ -134,7 +134,7 @@ IF(BUILD_STATIC_LIBS)
+     PROPERTIES OUTPUT_NAME sundials_cvode CLEAN_DIRECT_OUTPUT 1)
+ 
+   # Install the CVODE library
+-  INSTALL(TARGETS sundials_cvode_static DESTINATION lib)
++  INSTALL(TARGETS sundials_cvode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ENDIF(BUILD_STATIC_LIBS)
+ 
+@@ -156,7 +156,7 @@ IF(BUILD_SHARED_LIBS)
+   TARGET_LINK_LIBRARIES(sundials_cvode_shared -lm -llapack -lblas)
+ 
+   # Install the CVODE library
+-  INSTALL(TARGETS sundials_cvode_shared DESTINATION lib)
++  INSTALL(TARGETS sundials_cvode_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+--- a/src/cvode/fcmix/CMakeLists.txt
++++ b/src/cvode/fcmix/CMakeLists.txt
+@@ -57,7 +57,7 @@ SET_TARGET_PROPERTIES(sundials_fcvode_st
+   PROPERTIES OUTPUT_NAME sundials_fcvode CLEAN_DIRECT_OUTPUT 1)
+ 
+ # Install the FCVODE library
+-INSTALL(TARGETS sundials_fcvode_static DESTINATION lib)
++INSTALL(TARGETS sundials_fcvode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ #
+ MESSAGE(STATUS "Added CVODE FCMIX module")
+--- a/src/cvodes/CMakeLists.txt
++++ b/src/cvodes/CMakeLists.txt
+@@ -121,7 +121,7 @@ IF(BUILD_STATIC_LIBS)
+     PROPERTIES OUTPUT_NAME sundials_cvodes CLEAN_DIRECT_OUTPUT 1)
+ 
+   # Install the CVODES library
+-  INSTALL(TARGETS sundials_cvodes_static DESTINATION lib)
++  INSTALL(TARGETS sundials_cvodes_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ENDIF(BUILD_STATIC_LIBS)
+ 
+@@ -143,7 +143,7 @@ IF(BUILD_SHARED_LIBS)
+   TARGET_LINK_LIBRARIES(sundials_cvodes_shared -lm -llapack -lblas)
+ 
+   # Install the CVODES library
+-  INSTALL(TARGETS sundials_cvodes_shared DESTINATION lib)
++  INSTALL(TARGETS sundials_cvodes_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+--- a/src/ida/CMakeLists.txt
++++ b/src/ida/CMakeLists.txt
+@@ -124,7 +124,7 @@ IF(BUILD_STATIC_LIBS)
+     PROPERTIES OUTPUT_NAME sundials_ida CLEAN_DIRECT_OUTPUT 1)
+ 
+   # Install the IDA library
+-  INSTALL(TARGETS sundials_ida_static DESTINATION lib)
++  INSTALL(TARGETS sundials_ida_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ENDIF(BUILD_STATIC_LIBS)
+ 
+@@ -146,7 +146,7 @@ IF(BUILD_SHARED_LIBS)
+   TARGET_LINK_LIBRARIES(sundials_ida_shared -lm -llapack -lblas)
+ 
+   # Install the IDA library
+-  INSTALL(TARGETS sundials_ida_shared DESTINATION lib)
++  INSTALL(TARGETS sundials_ida_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+--- a/src/ida/fcmix/CMakeLists.txt
++++ b/src/ida/fcmix/CMakeLists.txt
+@@ -56,6 +56,6 @@ SET_TARGET_PROPERTIES(sundials_fida_stat
+   PROPERTIES OUTPUT_NAME sundials_fida CLEAN_DIRECT_OUTPUT 1)
+ 
+ # Install the FIDA library
+-INSTALL(TARGETS sundials_fida_static DESTINATION lib)
++INSTALL(TARGETS sundials_fida_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ #
+ MESSAGE(STATUS "Added IDA FCMIX module")
+--- a/src/idas/CMakeLists.txt
++++ b/src/idas/CMakeLists.txt
+@@ -126,7 +126,7 @@ IF(BUILD_STATIC_LIBS)
+     PROPERTIES OUTPUT_NAME sundials_idas CLEAN_DIRECT_OUTPUT 1)
+ 
+   # Install the IDA library
+-  INSTALL(TARGETS sundials_idas_static DESTINATION lib)
++  INSTALL(TARGETS sundials_idas_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ENDIF(BUILD_STATIC_LIBS)
+ 
+@@ -148,7 +148,7 @@ IF(BUILD_SHARED_LIBS)
+   TARGET_LINK_LIBRARIES(sundials_idas_shared -lm -llapack -lblas)
+ 
+   # Install the IDAS library
+-  INSTALL(TARGETS sundials_idas_shared DESTINATION lib)
++  INSTALL(TARGETS sundials_idas_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+--- a/src/kinsol/CMakeLists.txt
++++ b/src/kinsol/CMakeLists.txt
+@@ -134,7 +134,7 @@ IF(BUILD_STATIC_LIBS)
+     PROPERTIES OUTPUT_NAME sundials_kinsol CLEAN_DIRECT_OUTPUT 1)
+ 
+   # Install the KINSOL library
+-  INSTALL(TARGETS sundials_kinsol_static DESTINATION lib)
++  INSTALL(TARGETS sundials_kinsol_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ENDIF(BUILD_STATIC_LIBS)
+ 
+@@ -156,7 +156,7 @@ IF(BUILD_SHARED_LIBS)
+   TARGET_LINK_LIBRARIES(sundials_kinsol_shared -lm -llapack)
+ 
+   # Install the KINSOL library
+-  INSTALL(TARGETS sundials_kinsol_shared DESTINATION lib)
++  INSTALL(TARGETS sundials_kinsol_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+--- a/src/kinsol/fcmix/CMakeLists.txt
++++ b/src/kinsol/fcmix/CMakeLists.txt
+@@ -54,7 +54,7 @@ SET_TARGET_PROPERTIES(sundials_fkinsol_s
+   PROPERTIES OUTPUT_NAME sundials_fkinsol CLEAN_DIRECT_OUTPUT 1)
+ 
+ # Install the FKINSOL library
+-INSTALL(TARGETS sundials_fkinsol_static DESTINATION lib)
++INSTALL(TARGETS sundials_fkinsol_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ #
+ MESSAGE(STATUS "Added KINSOL FCMIX module")
+--- a/src/nvec_openmp/CMakeLists.txt
++++ b/src/nvec_openmp/CMakeLists.txt
+@@ -51,7 +51,7 @@ IF(BUILD_STATIC_LIBS)
+   ADD_LIBRARY(sundials_nvecopenmp_static STATIC ${nvecopenmp_SOURCES} ${shared_SOURCES})
+   SET_TARGET_PROPERTIES(sundials_nvecopenmp_static
+     PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
+-  INSTALL(TARGETS sundials_nvecopenmp_static DESTINATION lib)
++  INSTALL(TARGETS sundials_nvecopenmp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_STATIC_LIBS)
+ 
+ # Rules for building and installing the shared library:
+@@ -65,7 +65,7 @@ IF(BUILD_SHARED_LIBS)
+     PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_nvecopenmp_shared
+     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-  INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION lib)
++  INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the NVECOPENMP header files
+@@ -78,7 +78,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
+     ADD_LIBRARY(sundials_fnvecopenmp_static STATIC ${fnvecopenmp_SOURCES})
+     SET_TARGET_PROPERTIES(sundials_fnvecopenmp_static
+       PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
+-    INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION lib)
++    INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_STATIC_LIBS)
+   IF(BUILD_SHARED_LIBS)
+     ADD_LIBRARY(sundials_fnvecopenmp_shared ${fnvecopenmp_SOURCES})
+@@ -86,7 +86,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
+       PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fnvecopenmp_shared 
+       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-    INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION lib)
++    INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+ 
+--- a/src/nvec_par/CMakeLists.txt
++++ b/src/nvec_par/CMakeLists.txt
+@@ -52,7 +52,7 @@ IF(BUILD_STATIC_LIBS)
+   ADD_LIBRARY(sundials_nvecparallel_static STATIC ${nvecparallel_SOURCES} ${shared_SOURCES})
+   SET_TARGET_PROPERTIES(sundials_nvecparallel_static
+     PROPERTIES OUTPUT_NAME sundials_nvecparallel CLEAN_DIRECT_OUTPUT 1)
+-  INSTALL(TARGETS sundials_nvecparallel_static DESTINATION lib)
++  INSTALL(TARGETS sundials_nvecparallel_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_STATIC_LIBS)
+ 
+ # Rules for building and installing the shared library:
+@@ -67,7 +67,7 @@ IF(BUILD_SHARED_LIBS)
+   SET_TARGET_PROPERTIES(sundials_nvecparallel_shared 
+     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+   TARGET_LINK_LIBRARIES(sundials_nvecparallel_shared -lm)
+-  INSTALL(TARGETS sundials_nvecparallel_shared DESTINATION lib)
++  INSTALL(TARGETS sundials_nvecparallel_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the NVECPARALLEL header files
+@@ -80,7 +80,7 @@ IF(FCMIX_ENABLE AND MPIF_FOUND)
+     ADD_LIBRARY(sundials_fnvecparallel_static STATIC ${fnvecparallel_SOURCES})
+     SET_TARGET_PROPERTIES(sundials_fnvecparallel_static
+       PROPERTIES OUTPUT_NAME sundials_fnvecparallel CLEAN_DIRECT_OUTPUT 1)
+-    INSTALL(TARGETS sundials_fnvecparallel_static DESTINATION lib)
++    INSTALL(TARGETS sundials_fnvecparallel_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_STATIC_LIBS)
+   IF(BUILD_SHARED_LIBS)
+     ADD_LIBRARY(sundials_fnvecparallel_shared SHARED ${fnvecparallel_SOURCES})
+@@ -89,7 +89,7 @@ IF(FCMIX_ENABLE AND MPIF_FOUND)
+     SET_TARGET_PROPERTIES(sundials_fnvecparallel_shared
+       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+     TARGET_LINK_LIBRARIES(sundials_fnvecparallel_shared sundials_nvecparallel_shared)
+-    INSTALL(TARGETS sundials_fnvecparallel_shared DESTINATION lib)
++    INSTALL(TARGETS sundials_fnvecparallel_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ ENDIF(FCMIX_ENABLE AND MPIF_FOUND)
+ #
+--- a/src/nvec_pthreads/CMakeLists.txt
++++ b/src/nvec_pthreads/CMakeLists.txt
+@@ -44,7 +44,7 @@ IF(BUILD_STATIC_LIBS)
+   ADD_LIBRARY(sundials_nvecpthreads_static STATIC ${nvecpthreads_SOURCES} ${shared_SOURCES})
+   SET_TARGET_PROPERTIES(sundials_nvecpthreads_static
+     PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
+-  INSTALL(TARGETS sundials_nvecpthreads_static DESTINATION lib)
++  INSTALL(TARGETS sundials_nvecpthreads_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_STATIC_LIBS)
+ 
+ # Rules for building and installing the shared library:
+@@ -58,7 +58,7 @@ IF(BUILD_SHARED_LIBS)
+     PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_nvecpthreads_shared
+     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-  INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION lib)
++  INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the NVECPTHREADS header files
+@@ -71,7 +71,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
+     ADD_LIBRARY(sundials_fnvecpthreads_static STATIC ${fnvecpthreads_SOURCES})
+     SET_TARGET_PROPERTIES(sundials_fnvecpthreads_static
+       PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
+-    INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION lib)
++    INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_STATIC_LIBS)
+   IF(BUILD_SHARED_LIBS)
+     ADD_LIBRARY(sundials_fnvecpthreads_shared ${fnvecpthreads_SOURCES})
+@@ -79,7 +79,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
+       PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
+     SET_TARGET_PROPERTIES(sundials_fnvecpthreads_shared 
+       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-    INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION lib)
++    INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+ 
+--- a/src/nvec_ser/CMakeLists.txt
++++ b/src/nvec_ser/CMakeLists.txt
+@@ -44,7 +44,7 @@ IF(BUILD_STATIC_LIBS)
+   ADD_LIBRARY(sundials_nvecserial_static STATIC ${nvecserial_SOURCES} ${shared_SOURCES})
+   SET_TARGET_PROPERTIES(sundials_nvecserial_static
+     PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
+-  INSTALL(TARGETS sundials_nvecserial_static DESTINATION lib)
++  INSTALL(TARGETS sundials_nvecserial_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_STATIC_LIBS)
+ 
+ # Rules for building and installing the shared library:
+@@ -59,7 +59,7 @@ IF(BUILD_SHARED_LIBS)
+   SET_TARGET_PROPERTIES(sundials_nvecserial_shared
+     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+   TARGET_LINK_LIBRARIES(sundials_nvecserial_shared -lm)
+-  INSTALL(TARGETS sundials_nvecserial_shared DESTINATION lib)
++  INSTALL(TARGETS sundials_nvecserial_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the NVECSERIAL header files
+@@ -72,7 +72,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
+     ADD_LIBRARY(sundials_fnvecserial_static STATIC ${fnvecserial_SOURCES})
+     SET_TARGET_PROPERTIES(sundials_fnvecserial_static
+       PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
+-    INSTALL(TARGETS sundials_fnvecserial_static DESTINATION lib)
++    INSTALL(TARGETS sundials_fnvecserial_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_STATIC_LIBS)
+   IF(BUILD_SHARED_LIBS)
+     ADD_LIBRARY(sundials_fnvecserial_shared ${fnvecserial_SOURCES})
+@@ -81,7 +81,7 @@ IF(FCMIX_ENABLE AND F77_FOUND)
+     SET_TARGET_PROPERTIES(sundials_fnvecserial_shared 
+       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+     TARGET_LINK_LIBRARIES(sundials_fnvecserial_shared sundials_nvecserial_shared)
+-    INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION lib)
++    INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   ENDIF(BUILD_SHARED_LIBS)
+ ENDIF(FCMIX_ENABLE AND F77_FOUND)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 185e16d..48b1d76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Added-missing-linkages-to-the-DSOs.patch
+Fix-library-paths-for-multiarch.patch

-- 
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