[sundials] 06/06: patches

[Dima Kogan]

This is an automated email from the git hooks/post-receive script.

dkogan pushed a commit to branch master
in repository sundials.

commit 632689bd73da3309f94f8cefad5951588deba3f2
Author: Dima Kogan <dima at secretsauce.net>
Date:   Sun Apr 2 19:42:05 2017 -0700

    patches
---
 .../0002-Fix-library-paths-for-multiarch.patch     | 48 +++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0002-Fix-library-paths-for-multiarch.patch b/debian/patches/0002-Fix-library-paths-for-multiarch.patch
index 0ca62e9..184e471 100644
--- a/debian/patches/0002-Fix-library-paths-for-multiarch.patch
+++ b/debian/patches/0002-Fix-library-paths-for-multiarch.patch
@@ -16,9 +16,11 @@ Subject: Fix library paths for multiarch
  src/kinsol/fcmix/CMakeLists.txt  | 2 +-
  src/nvec_openmp/CMakeLists.txt   | 8 ++++----
  src/nvec_par/CMakeLists.txt      | 8 ++++----
+ src/nvec_parhyp/CMakeLists.txt   | 4 ++--
+ src/nvec_petsc/CMakeLists.txt    | 4 ++--
  src/nvec_pthreads/CMakeLists.txt | 8 ++++----
  src/nvec_ser/CMakeLists.txt      | 8 ++++----
- 15 files changed, 37 insertions(+), 33 deletions(-)
+ 17 files changed, 41 insertions(+), 37 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 08b6203..237889c 100644
@@ -307,6 +309,50 @@ index f60b795..3381ed2 100644
    ENDIF(BUILD_SHARED_LIBS)
  ENDIF(FCMIX_ENABLE AND MPIF_FOUND)
  #
+diff --git a/src/nvec_parhyp/CMakeLists.txt b/src/nvec_parhyp/CMakeLists.txt
+index 9255489..7d1eff6 100644
+--- a/src/nvec_parhyp/CMakeLists.txt
++++ b/src/nvec_parhyp/CMakeLists.txt
+@@ -53,7 +53,7 @@ IF(BUILD_STATIC_LIBS)
+   ADD_LIBRARY(sundials_nvecparhyp_static STATIC ${nvecparhyp_SOURCES} ${shared_SOURCES})
+   SET_TARGET_PROPERTIES(sundials_nvecparhyp_static
+     PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
+-  INSTALL(TARGETS sundials_nvecparhyp_static DESTINATION lib)
++  INSTALL(TARGETS sundials_nvecparhyp_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)
+     PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_nvecparhyp_shared 
+     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-  INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION lib)
++  INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the NVECPARHYP header files
+diff --git a/src/nvec_petsc/CMakeLists.txt b/src/nvec_petsc/CMakeLists.txt
+index a98867c..52f2b5b 100644
+--- a/src/nvec_petsc/CMakeLists.txt
++++ b/src/nvec_petsc/CMakeLists.txt
+@@ -53,7 +53,7 @@ IF(BUILD_STATIC_LIBS)
+   ADD_LIBRARY(sundials_nvecpetsc_static STATIC ${nvecpetsc_SOURCES} ${shared_SOURCES})
+   SET_TARGET_PROPERTIES(sundials_nvecpetsc_static
+     PROPERTIES OUTPUT_NAME sundials_nvecpetsc CLEAN_DIRECT_OUTPUT 1)
+-  INSTALL(TARGETS sundials_nvecpetsc_static DESTINATION lib)
++  INSTALL(TARGETS sundials_nvecpetsc_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)
+     PROPERTIES OUTPUT_NAME sundials_nvecpetsc CLEAN_DIRECT_OUTPUT 1)
+   SET_TARGET_PROPERTIES(sundials_nvecpetsc_shared 
+     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
+-  INSTALL(TARGETS sundials_nvecpetsc_shared DESTINATION lib)
++  INSTALL(TARGETS sundials_nvecpetsc_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ ENDIF(BUILD_SHARED_LIBS)
+ 
+ # Install the NVECPARHYP header files
 diff --git a/src/nvec_pthreads/CMakeLists.txt b/src/nvec_pthreads/CMakeLists.txt
 index b711d3a..58f08e7 100644
 --- a/src/nvec_pthreads/CMakeLists.txt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sundials.git