r47136 - in /packages/getdp/trunk/debian/patches: petsc.patch series

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Sat Oct 10 16:48:15 2015
New Revision: 47136

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47136
Log:
fix PETS/SPLEC when splitted into several libs

Added:
    packages/getdp/trunk/debian/patches/petsc.patch
Modified:
    packages/getdp/trunk/debian/patches/series

Added: packages/getdp/trunk/debian/patches/petsc.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/patches/petsc.patch?rev=47136&op=file
==============================================================================
--- packages/getdp/trunk/debian/patches/petsc.patch	(added)
+++ packages/getdp/trunk/debian/patches/petsc.patch	Sat Oct 10 16:48:15 2015
@@ -0,0 +1,56 @@
+Index: getdp-2.6.2~svn4257/CMakeLists.txt
+===================================================================
+--- getdp-2.6.2~svn4257.orig/CMakeLists.txt
++++ getdp-2.6.2~svn4257/CMakeLists.txt
+@@ -382,13 +382,15 @@ if(ENABLE_PETSC)
+       endif(PETSC_PACKAGES_INCLUDES)
+     endif(PETSC_PACKAGES_INCLUDES)
+     # find libraries (<= 3.0)
+-    set(PETSC_LIBS_REQUIRED petscksp petscdm petscmat petscvec petsc)
++    set(PETSC_LIBS_REQUIRED petscksp petscdm petscmat petscvec petscsys petscsnes)
+     find_all_libraries(PETSC_LIBS PETSC_LIBS_REQUIRED
+                        ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib "")
++    message(STATUS "Using PETSC_LIBS : ${PETSC_LIBS}")
+     # petsc 3.1 creates only one library (libpetsc)
+     if(NOT PETSC_LIBS)
+       find_library(PETSC_LIBS petsc PATHS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib
+                    NO_DEFAULT_PATH)
++      message(STATUS "Using PETSC_LIB : ${PETSC_LIBS}")
+     endif(NOT PETSC_LIBS)
+     if(PETSC_LIBS)
+       set_config_option(HAVE_PETSC "PETSc")
+@@ -406,15 +408,22 @@ if(ENABLE_PETSC)
+       else(SLEPC_DIR)
+         set(ENV_SLEPC_DIR $ENV{SLEPC_DIR})
+       endif(SLEPC_DIR)
+-      find_library(SLEPC_LIB slepc PATHS ${ENV_SLEPC_DIR}/${ENV_PETSC_ARCH}/lib
++      set(SLEPC_LIBS_REQUIRED slepcsys slepcmfn slepceps slepcsvd slepcpep slepcnep)
++      find_all_libraries(SLEPC_LIBS SLEPC_LIBS_REQUIRED
++                       ${ENV_SLEPC_DIR}/${ENV_PETSC_ARCH}/lib "")
++      message(STATUS "Using SLEPC_LIBS : ${SLEPC_LIBS}")
++      if(NOT SLEPC_LIBS)
++        find_library(SLEPC_LIBS slepc PATHS ${ENV_SLEPC_DIR}/${ENV_PETSC_ARCH}/lib
+                    NO_DEFAULT_PATH)
+-      if(SLEPC_LIB)
++        message(STATUS "Using SLEPC_LIB : ${SLEPC_LIBS}")
++      endif(NOT SLEPC_LIBS)
++      if(SLEPC_LIBS)
+         find_path(SLEPC_INC "slepc.h" PATHS ${ENV_SLEPC_DIR} PATH_SUFFIXES include
+                   ${ENV_PETSC_ARCH}/include include/slepc NO_DEFAULT_PATH)
+         if(SLEPC_INC)
+           message(STATUS "Using SLEPc dir: ${ENV_SLEPC_DIR}")
+           set_config_option(HAVE_SLEPC "SLEPc")
+-          list(APPEND EXTERNAL_LIBRARIES ${SLEPC_LIB})
++          list(APPEND EXTERNAL_LIBRARIES ${SLEPC_LIBS})
+           list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC})
+           find_path(SLEPC_INC2 "slepcconf.h" PATHS ${ENV_SLEPC_DIR}
+                     PATH_SUFFIXES ${ENV_PETSC_ARCH}/include NO_DEFAULT_PATH)
+@@ -422,7 +431,7 @@ if(ENABLE_PETSC)
+             list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC2})
+           endif(SLEPC_INC2)
+         endif(SLEPC_INC)
+-      endif(SLEPC_LIB)
++      endif(SLEPC_LIBS)
+     endif(ENABLE_SLEPC)
+     list(APPEND EXTERNAL_LIBRARIES ${PETSC_LIBS})
+     # find additional libraries to link with

Modified: packages/getdp/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/patches/series?rev=47136&op=diff
==============================================================================
--- packages/getdp/trunk/debian/patches/series	(original)
+++ packages/getdp/trunk/debian/patches/series	Sat Oct 10 16:48:15 2015
@@ -4,3 +4,4 @@
 ##fix_latest_svn.patch
 #cmake.patch
 cmake.patch
+petsc.patch