r47334 - in /packages/getdp/trunk/debian: changelog control patches/petsc.patch rules
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Thu Aug 18 12:57:55 UTC 2016
Author: trophime-guest
Date: Thu Aug 18 12:57:55 2016
New Revision: 47334
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47334
Log:
update to 2.9.0
Modified:
packages/getdp/trunk/debian/changelog
packages/getdp/trunk/debian/control
packages/getdp/trunk/debian/patches/petsc.patch
packages/getdp/trunk/debian/rules
Modified: packages/getdp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/changelog?rev=47334&op=diff
==============================================================================
--- packages/getdp/trunk/debian/changelog (original)
+++ packages/getdp/trunk/debian/changelog Thu Aug 18 12:57:55 2016
@@ -1,3 +1,9 @@
+getdp (2.9.0-1) unstable; urgency=medium
+
+ * new upstream release
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Thu, 18 Aug 2016 13:12:18 +0200
+
getdp (2.7.0-4) unstable; urgency=medium
* rebuild against libopenmpi1.10
Modified: packages/getdp/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/control?rev=47334&op=diff
==============================================================================
--- packages/getdp/trunk/debian/control (original)
+++ packages/getdp/trunk/debian/control Thu Aug 18 12:57:55 2016
@@ -7,7 +7,8 @@
gfortran, mpi-default-dev,
python-dev (>= 2.6.6-3~), swig,
libarpack2-dev, libgsl-dev,
- libpetsc3.6.3-dev, libslepc3.6.2-dev,
+ libpetsc3.6.4-dev,
+ libslepc3.6.3-dev,
texlive, texlive-generic-recommended
# gmsh-tetgen | gmsh,
# libgmsh-tetgen-dev | libgmsh-dev,
@@ -34,6 +35,22 @@
See GetDP's reference manual for a more thorough overview of GetDP's
capabilities: http://www.geuz.org/getdp
+# Package: zgetdp
+# Architecture: any
+# Depends: ${shlibs:Depends}, ${misc:Depends}, dpkg (>= 1.15.4) | install-info
+# Description: general environment for the treatment of discrete problems
+# GetDP is a general finite element solver using mixed elements to
+# discretize de Rham-type complexes in one, two and three dimensions.
+# .
+# The main feature of GetDP is the closeness between the input data
+# defining discrete problems (written by the user in ASCII data files)
+# and the symbolic mathematical expressions of these problems.
+# .
+# This package provide getdp for complex
+# .
+# See GetDP's reference manual for a more thorough overview of GetDP's
+# capabilities: http://www.geuz.org/getdp
+
Package: getdp-sparskit
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Modified: packages/getdp/trunk/debian/patches/petsc.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/patches/petsc.patch?rev=47334&op=diff
==============================================================================
--- packages/getdp/trunk/debian/patches/petsc.patch (original)
+++ packages/getdp/trunk/debian/patches/petsc.patch Thu Aug 18 12:57:55 2016
@@ -1,56 +1,436 @@
-Index: getdp-2.6.2~svn4257/CMakeLists.txt
+Index: getdp-2.9.0/CMakeLists.txt
===================================================================
---- getdp-2.6.2~svn4257.orig/CMakeLists.txt
-+++ getdp-2.6.2~svn4257/CMakeLists.txt
-@@ -382,13 +382,15 @@ if(ENABLE_PETSC)
+--- getdp-2.9.0.orig/CMakeLists.txt
++++ getdp-2.9.0/CMakeLists.txt
+@@ -335,138 +335,305 @@ if(ENABLE_SMALLFEM)
+ endif(SMALLFEM_LIB AND SMALLFEM_INC)
+ endif(ENABLE_SMALLFEM)
+
+-if(ENABLE_PETSC)
+- if(PETSC_DIR)
+- set(ENV_PETSC_DIR ${PETSC_DIR})
+- else(PETSC_DIR)
+- set(ENV_PETSC_DIR $ENV{PETSC_DIR})
+- endif(PETSC_DIR)
+- if(PETSC_ARCH)
+- set(ENV_PETSC_ARCH ${PETSC_ARCH})
+- else(PETSC_ARCH)
+- set(ENV_PETSC_ARCH $ENV{PETSC_ARCH})
+- endif(PETSC_ARCH)
+- set(PETSC_POSSIBLE_CONF_FILES
+- ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/conf/petscvariables
+- ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib/petsc-conf/petscvariables
+- ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib/petsc/conf/petscvariables)
+- foreach(FILE ${PETSC_POSSIBLE_CONF_FILES})
+- if(EXISTS ${FILE})
+- # old-style PETSc installations (using PETSC_DIR and PETSC_ARCH)
+- message(STATUS "Using PETSc dir: ${ENV_PETSC_DIR}")
+- message(STATUS "Using PETSc arch: ${ENV_PETSC_ARCH}")
+- # find includes by parsing the petscvariables file
+- file(STRINGS ${FILE} PETSC_VARIABLES NEWLINE_CONSUME)
+- endif(EXISTS ${FILE})
+- endforeach(FILE)
+- if(PETSC_VARIABLES)
+- # try to find PETSC_CC_INCLUDES for PETSc >= 3.4
+- string(REGEX MATCH "PETSC_CC_INCLUDES = [^\n\r]*" PETSC_PACKAGES_INCLUDES
+- ${PETSC_VARIABLES})
+- if(PETSC_PACKAGES_INCLUDES)
+- string(REPLACE "PETSC_CC_INCLUDES = " "" PETSC_PACKAGES_INCLUDES
+- ${PETSC_PACKAGES_INCLUDES})
+- else(PETSC_PACKAGES_INCLUDES)
+- # try to find PETSC_PACKAGES_INCLUDES in older versions
+- list(APPEND EXTERNAL_INCLUDES ${ENV_PETSC_DIR}/include)
+- list(APPEND EXTERNAL_INCLUDES ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/include)
+- string(REGEX MATCH "PACKAGES_INCLUDES = [^\n\r]*" PETSC_PACKAGES_INCLUDES
++ if(ENABLE_PETSC)
++ if(PETSC_DIR)
++ set(ENV_PETSC_DIR ${PETSC_DIR})
++ else(PETSC_DIR)
++ set(ENV_PETSC_DIR $ENV{PETSC_DIR})
++ endif(PETSC_DIR)
++ if(PETSC_ARCH)
++ set(ENV_PETSC_ARCH ${PETSC_ARCH})
++ else(PETSC_ARCH)
++ set(ENV_PETSC_ARCH $ENV{PETSC_ARCH})
++ endif(PETSC_ARCH)
++ set(PETSC_POSSIBLE_CONF_FILES
++ ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/conf/petscvariables
++ ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib/petsc-conf/petscvariables
++ ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib/petsc/conf/petscvariables)
++ foreach(FILE ${PETSC_POSSIBLE_CONF_FILES})
++ if(EXISTS ${FILE})
++ # old-style PETSc installations (using PETSC_DIR and PETSC_ARCH)
++ message(STATUS "Using PETSc dir: ${ENV_PETSC_DIR}")
++ message(STATUS "Using PETSc arch: ${ENV_PETSC_ARCH}")
++ # find includes by parsing the petscvariables file
++ file(STRINGS ${FILE} PETSC_VARIABLES NEWLINE_CONSUME)
++ endif(EXISTS ${FILE})
++ endforeach(FILE)
++ if(PETSC_VARIABLES)
++ # try to find PETSC_CC_INCLUDES for PETSc >= 3.4
++ string(REGEX MATCH "PETSC_CC_INCLUDES = [^\n\r]*" PETSC_PACKAGES_INCLUDES
+ ${PETSC_VARIABLES})
+- string(REPLACE "PACKAGES_INCLUDES = " "" PETSC_PACKAGES_INCLUDES
+- ${PETSC_PACKAGES_INCLUDES})
+- endif(PETSC_PACKAGES_INCLUDES)
+- if(PETSC_PACKAGES_INCLUDES)
+ if(PETSC_PACKAGES_INCLUDES)
+- string(REPLACE "-I" "" PETSC_PACKAGES_INCLUDES ${PETSC_PACKAGES_INCLUDES})
+- string(REPLACE " " ";" PETSC_PACKAGES_INCLUDES ${PETSC_PACKAGES_INCLUDES})
+- foreach(VAR ${PETSC_PACKAGES_INCLUDES})
+- list(APPEND EXTERNAL_INCLUDES ${VAR})
+- endforeach(VAR)
++ string(REPLACE "PETSC_CC_INCLUDES = " "" PETSC_PACKAGES_INCLUDES
++ ${PETSC_PACKAGES_INCLUDES})
++ else(PETSC_PACKAGES_INCLUDES)
++ # try to find PETSC_PACKAGES_INCLUDES in older versions
++ list(APPEND EXTERNAL_INCLUDES ${ENV_PETSC_DIR}/include)
++ list(APPEND EXTERNAL_INCLUDES ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/include)
++ string(REGEX MATCH "PACKAGES_INCLUDES = [^\n\r]*" PETSC_PACKAGES_INCLUDES
++ ${PETSC_VARIABLES})
++ string(REPLACE "PACKAGES_INCLUDES = " "" PETSC_PACKAGES_INCLUDES
++ ${PETSC_PACKAGES_INCLUDES})
endif(PETSC_PACKAGES_INCLUDES)
- endif(PETSC_PACKAGES_INCLUDES)
- # find libraries (<= 3.0)
+- 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_all_libraries(PETSC_LIBS PETSC_LIBS_REQUIRED
+- ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib "")
+- # 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)
+- endif(NOT PETSC_LIBS)
+- if(PETSC_LIBS)
+- set_config_option(HAVE_PETSC "PETSc")
+- if(NOT HAVE_BLAS)
+- set_config_option(HAVE_BLAS "Blas(PETSc)")
+- endif(NOT HAVE_BLAS)
+- if(NOT HAVE_LAPACK)
+- set_config_option(HAVE_LAPACK "Lapack(PETSc)")
+- endif(NOT HAVE_LAPACK)
+- endif(PETSC_LIBS)
+- # find slepc (needs to be linked in before petsc)
+- if(ENABLE_SLEPC)
+- if(SLEPC_DIR)
+- set(ENV_SLEPC_DIR ${SLEPC_DIR})
+- 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
+- NO_DEFAULT_PATH)
+- if(SLEPC_LIB)
+- 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_INCLUDES ${SLEPC_INC})
+- find_path(SLEPC_INC2 "slepcconf.h" PATHS ${ENV_SLEPC_DIR}
+- PATH_SUFFIXES ${ENV_PETSC_ARCH}/include NO_DEFAULT_PATH)
+- if(SLEPC_INC2)
+- list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC2})
+- endif(SLEPC_INC2)
+- endif(SLEPC_INC)
+- endif(SLEPC_LIB)
+- endif(ENABLE_SLEPC)
+- list(APPEND EXTERNAL_LIBRARIES ${PETSC_LIBS})
+- # find additional libraries to link with
+- string(REGEX MATCH "PACKAGES_LIBS = [^\n\r]*" PLIBS ${PETSC_VARIABLES})
+- if(PLIBS)
+- string(REPLACE "PACKAGES_LIBS = " "" PLIBS ${PLIBS})
+- string(STRIP ${PLIBS} PLIBS)
+- list(APPEND EXTERNAL_LIBRARIES "${PLIBS}")
+- endif(PLIBS)
+- string(REGEX MATCH "PETSC_EXTERNAL_LIB_BASIC = [^\n\r]*" PLIBS_BASIC ${PETSC_VARIABLES})
+- if(PLIBS_BASIC)
+- string(REPLACE "PETSC_EXTERNAL_LIB_BASIC = " "" PLIBS_BASIC ${PLIBS_BASIC})
+- string(STRIP ${PLIBS_BASIC} PLIBS_BASIC)
+- list(APPEND EXTERNAL_LIBRARIES "${PLIBS_BASIC}")
+- endif(PLIBS_BASIC)
+- string(REGEX MATCH "PCC_LINKER_LIBS = [^\n\r]*" LLIBS ${PETSC_VARIABLES})
+- if(LLIBS)
+- string(REPLACE "PCC_LINKER_LIBS = " "" LLIBS ${LLIBS})
+- string(STRIP ${LLIBS} LLIBS)
+- list(APPEND EXTERNAL_LIBRARIES "${LLIBS}")
+- endif(LLIBS)
+- else(PETSC_VARIABLES)
+- # new-style PETSc installations (in standard system directories)
+- find_library(PETSC_LIBS petsc)
+- find_path(PETSC_INC "petsc.h" PATH_SUFFIXES include/petsc)
+- if(PETSC_LIBS AND PETSC_INC)
+- set_config_option(HAVE_PETSC "PETSc")
++ if(PETSC_PACKAGES_INCLUDES)
++ if(PETSC_PACKAGES_INCLUDES)
++ string(REPLACE "-I" "" PETSC_PACKAGES_INCLUDES ${PETSC_PACKAGES_INCLUDES})
++ string(REPLACE " " ";" PETSC_PACKAGES_INCLUDES ${PETSC_PACKAGES_INCLUDES})
++ foreach(VAR ${PETSC_PACKAGES_INCLUDES})
++ # seem to include unexisting directories (/usr/include/lib64)
++ # check to avoid warnings
++ if(EXISTS ${VAR})
++ list(APPEND EXTERNAL_INCLUDES ${VAR})
++ endif(EXISTS ${VAR})
++ endforeach(VAR)
++ endif(PETSC_PACKAGES_INCLUDES)
++ endif(PETSC_PACKAGES_INCLUDES)
++ # find libraries (<= 3.0)
++ set(PETSC_LIBS_REQUIRED petscksp petscdm petscmat petscvec petscsnes petscsys)
++# foreach(_l ${PETSC_LIBS_REQUIRED})
++# FIND_LIBRARY(TMP_${_l} ${_l}
++# ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib
++# )
++# if (TMP_${_l})
++# message(STATUS "${_l} found : ${TMP_${_l}}" )
++# list(APPEND PETSC_LIBS "${TMP_${_l}}")
++# else ()
++# message(STATUS "${_l} not found : ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib" )
++# endif()
++# endforeach()
++ 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_real PATHS ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib
++ NO_DEFAULT_PATH)
++ message(STATUS "Using PETSC_LIBS : ${PETSC_LIBS}")
++ endif(NOT PETSC_LIBS)
++ if(PETSC_LIBS)
++ set_config_option(HAVE_PETSC "PETSc")
++ if(NOT HAVE_BLAS)
++ set_config_option(HAVE_BLAS "Blas(PETSc)")
++ endif(NOT HAVE_BLAS)
++ if(NOT HAVE_LAPACK)
++ set_config_option(HAVE_LAPACK "Lapack(PETSc)")
++ endif(NOT HAVE_LAPACK)
++ endif(PETSC_LIBS)
++ # find slepc (needs to be linked in before petsc)
+ if(ENABLE_SLEPC)
+- find_library(SLEPC_LIB slepc)
+- find_path(SLEPC_INC "slepc.h" PATH_SUFFIXES include/slepc)
+- if(SLEPC_LIB AND SLEPC_INC)
+- set_config_option(HAVE_SLEPC "SLEPc")
+- list(APPEND EXTERNAL_LIBRARIES ${SLEPC_LIB})
+- list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC})
+- endif(SLEPC_LIB AND SLEPC_INC)
++ if(SLEPC_DIR)
++ set(ENV_SLEPC_DIR ${SLEPC_DIR})
++ else(SLEPC_DIR)
++ set(ENV_SLEPC_DIR $ENV{SLEPC_DIR})
++ endif(SLEPC_DIR)
++ 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
++ message(STATUS "Using SLEPC_LIBS : ${SLEPC_LIBS}")
++ if(NOT SLEPC_LIBS)
++ find_library(SLEPC_LIBS slepc_real PATHS ${ENV_SLEPC_DIR}/${ENV_PETSC_ARCH}/lib
++ NO_DEFAULT_PATH)
++ 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_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)
++ if(SLEPC_INC2)
++ list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC2})
++ endif(SLEPC_INC2)
++ endif(SLEPC_INC)
++ endif(SLEPC_LIBS)
+ endif(ENABLE_SLEPC)
+ list(APPEND EXTERNAL_LIBRARIES ${PETSC_LIBS})
+- list(APPEND EXTERNAL_INCLUDES ${PETSC_INC})
+- endif(PETSC_LIBS AND PETSC_INC)
+- endif(PETSC_VARIABLES)
+-endif(ENABLE_PETSC)
++ # find additional libraries to link with
++ string(REGEX MATCH "PACKAGES_LIBS = [^\n\r]*" PLIBS ${PETSC_VARIABLES})
++ if(PLIBS)
++ string(REPLACE "PACKAGES_LIBS = " "" PLIBS ${PLIBS})
++ string(STRIP ${PLIBS} PLIBS)
++ list(APPEND EXTERNAL_LIBRARIES "${PLIBS}")
++ endif(PLIBS)
++ string(REGEX MATCH "PETSC_EXTERNAL_LIB_BASIC = [^\n\r]*" PLIBS_BASIC ${PETSC_VARIABLES})
++ if(PLIBS_BASIC)
++ string(REPLACE "PETSC_EXTERNAL_LIB_BASIC = " "" PLIBS_BASIC ${PLIBS_BASIC})
++ string(STRIP ${PLIBS_BASIC} PLIBS_BASIC)
++ separate_arguments(PLIBS_BASIC)
++ list(APPEND EXTERNAL_LIBRARIES "${PLIBS_BASIC}")
++ endif(PLIBS_BASIC)
++ string(REGEX MATCH "PCC_LINKER_LIBS = [^\n\r]*" LLIBS ${PETSC_VARIABLES})
++ if(LLIBS)
++ string(REPLACE "PCC_LINKER_LIBS = " "" LLIBS ${LLIBS})
++ string(STRIP ${LLIBS} LLIBS)
++ list(APPEND EXTERNAL_LIBRARIES "${LLIBS}")
++ endif(LLIBS)
++ else(PETSC_VARIABLES)
++ # new-style PETSc installations (in standard system directories)
++ find_library(PETSC_LIBS petsc)
++ find_path(PETSC_INC "petsc.h" PATH_SUFFIXES include/petsc)
++ if(PETSC_LIBS AND PETSC_INC)
++ set_config_option(HAVE_PETSC "PETSc")
++ if(ENABLE_SLEPC)
++ find_library(SLEPC_LIB slepc)
++ find_path(SLEPC_INC "slepc.h" PATH_SUFFIXES include/slepc)
++ if(SLEPC_LIB AND SLEPC_INC)
++ set_config_option(HAVE_SLEPC "SLEPc")
++ list(APPEND EXTERNAL_LIBRARIES ${SLEPC_LIB})
++ list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC})
++ endif(SLEPC_LIB AND SLEPC_INC)
++ endif(ENABLE_SLEPC)
++ list(APPEND EXTERNAL_LIBRARIES ${PETSC_LIBS})
++ list(APPEND EXTERNAL_INCLUDES ${PETSC_INC})
++ endif(PETSC_LIBS AND PETSC_INC)
++ endif(PETSC_VARIABLES)
++ endif(ENABLE_PETSC)
++
++# if(ENABLE_PETSC)
++# if(PETSC_DIR)
++# set(ENV_PETSC_DIR ${PETSC_DIR})
++# else(PETSC_DIR)
++# set(ENV_PETSC_DIR $ENV{PETSC_DIR})
++# endif(PETSC_DIR)
++# if(PETSC_ARCH)
++# set(ENV_PETSC_ARCH ${PETSC_ARCH})
++# else(PETSC_ARCH)
++# set(ENV_PETSC_ARCH $ENV{PETSC_ARCH})
++# endif(PETSC_ARCH)
++# set(PETSC_POSSIBLE_CONF_FILES
++# ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/conf/petscvariables
++# ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib/petsc-conf/petscvariables
++# ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib/petsc/conf/petscvariables)
++# foreach(FILE ${PETSC_POSSIBLE_CONF_FILES})
++# if(EXISTS ${FILE})
++# # old-style PETSc installations (using PETSC_DIR and PETSC_ARCH)
++# message(STATUS "Using PETSc dir: ${ENV_PETSC_DIR}")
++# message(STATUS "Using PETSc arch: ${ENV_PETSC_ARCH}")
++# # find includes by parsing the petscvariables file
++# file(STRINGS ${FILE} PETSC_VARIABLES NEWLINE_CONSUME)
++# endif(EXISTS ${FILE})
++# endforeach(FILE)
++# if(PETSC_VARIABLES)
++# # try to find PETSC_CC_INCLUDES for PETSc >= 3.4
++# string(REGEX MATCH "PETSC_CC_INCLUDES = [^\n\r]*" PETSC_PACKAGES_INCLUDES
++# ${PETSC_VARIABLES})
++# if(PETSC_PACKAGES_INCLUDES)
++# string(REPLACE "PETSC_CC_INCLUDES = " "" PETSC_PACKAGES_INCLUDES
++# ${PETSC_PACKAGES_INCLUDES})
++# else(PETSC_PACKAGES_INCLUDES)
++# # try to find PETSC_PACKAGES_INCLUDES in older versions
++# list(APPEND EXTERNAL_INCLUDES ${ENV_PETSC_DIR}/include)
++# list(APPEND EXTERNAL_INCLUDES ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/include)
++# string(REGEX MATCH "PACKAGES_INCLUDES = [^\n\r]*" PETSC_PACKAGES_INCLUDES
++# ${PETSC_VARIABLES})
++# string(REPLACE "PACKAGES_INCLUDES = " "" PETSC_PACKAGES_INCLUDES
++# ${PETSC_PACKAGES_INCLUDES})
++# endif(PETSC_PACKAGES_INCLUDES)
++# if(PETSC_PACKAGES_INCLUDES)
++# if(PETSC_PACKAGES_INCLUDES)
++# string(REPLACE "-I" "" PETSC_PACKAGES_INCLUDES ${PETSC_PACKAGES_INCLUDES})
++# string(REPLACE " " ";" PETSC_PACKAGES_INCLUDES ${PETSC_PACKAGES_INCLUDES})
++# foreach(VAR ${PETSC_PACKAGES_INCLUDES})
++# list(APPEND EXTERNAL_INCLUDES ${VAR})
++# endforeach(VAR)
++# endif(PETSC_PACKAGES_INCLUDES)
++# endif(PETSC_PACKAGES_INCLUDES)
++# # find libraries (<= 3.0)
++# 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")
++# if(NOT HAVE_BLAS)
++# set_config_option(HAVE_BLAS "Blas(PETSc)")
++# endif(NOT HAVE_BLAS)
++# if(NOT HAVE_LAPACK)
++# set_config_option(HAVE_LAPACK "Lapack(PETSc)")
++# endif(NOT HAVE_LAPACK)
++# endif(PETSC_LIBS)
++# # find slepc (needs to be linked in before petsc)
++# if(ENABLE_SLEPC)
++# if(SLEPC_DIR)
++# set(ENV_SLEPC_DIR ${SLEPC_DIR})
++# else(SLEPC_DIR)
++# set(ENV_SLEPC_DIR $ENV{SLEPC_DIR})
++# endif(SLEPC_DIR)
++# 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)
++# 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_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)
++# if(SLEPC_INC2)
++# list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC2})
++# endif(SLEPC_INC2)
++# endif(SLEPC_INC)
++# endif(SLEPC_LIBS)
++# endif(ENABLE_SLEPC)
++# list(APPEND EXTERNAL_LIBRARIES ${PETSC_LIBS})
++# # find additional libraries to link with
++# string(REGEX MATCH "PACKAGES_LIBS = [^\n\r]*" PLIBS ${PETSC_VARIABLES})
++# if(PLIBS)
++# string(REPLACE "PACKAGES_LIBS = " "" PLIBS ${PLIBS})
++# string(STRIP ${PLIBS} PLIBS)
++# list(APPEND EXTERNAL_LIBRARIES "${PLIBS}")
++# endif(PLIBS)
++# string(REGEX MATCH "PETSC_EXTERNAL_LIB_BASIC = [^\n\r]*" PLIBS_BASIC ${PETSC_VARIABLES})
++# if(PLIBS_BASIC)
++# string(REPLACE "PETSC_EXTERNAL_LIB_BASIC = " "" PLIBS_BASIC ${PLIBS_BASIC})
++# string(STRIP ${PLIBS_BASIC} PLIBS_BASIC)
++# list(APPEND EXTERNAL_LIBRARIES "${PLIBS_BASIC}")
++# endif(PLIBS_BASIC)
++# string(REGEX MATCH "PCC_LINKER_LIBS = [^\n\r]*" LLIBS ${PETSC_VARIABLES})
++# if(LLIBS)
++# string(REPLACE "PCC_LINKER_LIBS = " "" LLIBS ${LLIBS})
++# string(STRIP ${LLIBS} LLIBS)
++# list(APPEND EXTERNAL_LIBRARIES "${LLIBS}")
++# endif(LLIBS)
++# else(PETSC_VARIABLES)
++# # new-style PETSc installations (in standard system directories)
++# find_library(PETSC_LIBS petsc)
++# find_path(PETSC_INC "petsc.h" PATH_SUFFIXES include/petsc)
++# if(PETSC_LIBS AND PETSC_INC)
++# set_config_option(HAVE_PETSC "PETSc")
++# if(ENABLE_SLEPC)
++# find_library(SLEPC_LIB slepc)
++# find_path(SLEPC_INC "slepc.h" PATH_SUFFIXES include/slepc)
++# if(SLEPC_LIB AND SLEPC_INC)
++# set_config_option(HAVE_SLEPC "SLEPc")
++# list(APPEND EXTERNAL_LIBRARIES ${SLEPC_LIB})
++# list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC})
++# endif(SLEPC_LIB AND SLEPC_INC)
++# endif(ENABLE_SLEPC)
++# list(APPEND EXTERNAL_LIBRARIES ${PETSC_LIBS})
++# list(APPEND EXTERNAL_INCLUDES ${PETSC_INC})
++# endif(PETSC_LIBS AND PETSC_INC)
++# endif(PETSC_VARIABLES)
++# endif(ENABLE_PETSC)
+
+ if(ENABLE_ARPACK AND NOT ENABLE_CONTRIB_ARPACK)
+ if(HAVE_LAPACK OR HAVE_PETSC)
Modified: packages/getdp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/rules?rev=47334&op=diff
==============================================================================
--- packages/getdp/trunk/debian/rules (original)
+++ packages/getdp/trunk/debian/rules Thu Aug 18 12:57:55 2016
@@ -9,17 +9,8 @@
export DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
# PETSC_DIR is the location of PETSc.
-export SLEPC_DIR=/usr/lib/slepcdir/3.6.2
-export PETSC_DIR=/usr/lib/petscdir/3.6.3
-
-# Fix FTBS on armhf
-export PETSC_ARCH=linux-gnu-c-opt
-ifeq ("armhf", "$(DEB_HOST_ARCH)")
-export PETSC_ARCH=linux-gnueabihf-c-opt
-endif
-ifeq ("armel", "$(DEB_HOST_ARCH)")
-export PETSC_ARCH=linux-gnueabi-c-opt
-endif
+export PETSC_DIR=/usr/lib/petscdir/3.6.4/x86_64-linux-gnu-real
+export SLEPC_DIR=/usr/lib/slepcdir/3.6.3/x86_64-linux-gnu-real
%:
dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --parallel
@@ -45,11 +36,21 @@
override_dh_auto_configure:
dh_auto_configure --buildsystem=cmake --builddirectory=$(BUILDDIR)/petsc --parallel -- $(extra_flags)
dh_auto_configure --buildsystem=cmake --builddirectory=$(BUILDDIR)/sparskit --parallel -- $(extra_flags_sparskit) -DENABLE_PETSC=0 -DENABLE_SPARSKIT=1
+
+ # # set PETSC_DIR for complex version
+ #export PETSC_DIR=/usr/lib/petscdir/3.6.4/x86_64-linux-gnu-complex
+ #export SLEPC_DIR=/usr/lib/slepcdir/3.6.3/x86_64-linux-gnu-complex
+ #dh_auto_configure --buildsystem=cmake --builddirectory=$(BUILDDIR)/zpetsc --parallel -- $(extra_flags)
+ # # reset PETSC_DIR for complex version
+ #export PETSC_DIR=/usr/lib/petscdir/3.6.4/x86_64-linux-gnu-real
+ #export SLEPC_DIR=/usr/lib/slepcdir/3.6.3/x86_64-linux-gnu-real
override_dh_auto_build:
echo "installing getdp"
dh_auto_build --builddirectory=$(BUILDDIR)/petsc
+ # echo "installing zgetdp"
+ # dh_auto_build --builddirectory=$(BUILDDIR)/zpetsc
echo "installing getdp-sparskit"
dh_auto_build --builddirectory=$(BUILDDIR)/sparskit
mv $(BUILDDIR)/sparskit/getdp $(BUILDDIR)/sparskit/getdp-sparskit
@@ -57,10 +58,12 @@
override_dh_auto_install:
echo "installing getdp"
dh_auto_install --builddirectory=$(BUILDDIR)/petsc
+ # echo "installing getdp"
+ # dh_auto_install --builddirectory=$(BUILDDIR)/zpetsc
#override_dh_shlibdeps:
# echo "dh_shlibdeps skipped"
-
+
override_dh_auto_clean:
rm -rf $(BUILDDIR)/petsc $(BUILDDIR)/sparskit
More information about the debian-science-commits
mailing list