r45896 - in /packages/trilinos/trunk/debian: README.Debian changelog control libtrilinos-dev.install patches/dist-packages.patch patches/install.patch patches/series patches/sharedlibs.patch rules

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Thu May 16 15:46:10 UTC 2013


Author: trophime-guest
Date: Thu May 16 15:46:10 2013
New Revision: 45896

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45896
Log:
update to 11.2.3

Added:
    packages/trilinos/trunk/debian/patches/dist-packages.patch
    packages/trilinos/trunk/debian/patches/install.patch
Modified:
    packages/trilinos/trunk/debian/README.Debian
    packages/trilinos/trunk/debian/changelog
    packages/trilinos/trunk/debian/control
    packages/trilinos/trunk/debian/libtrilinos-dev.install
    packages/trilinos/trunk/debian/patches/series
    packages/trilinos/trunk/debian/patches/sharedlibs.patch
    packages/trilinos/trunk/debian/rules

Modified: packages/trilinos/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/README.Debian?rev=45896&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/README.Debian (original)
+++ packages/trilinos/trunk/debian/README.Debian Thu May 16 15:46:10 2013
@@ -1,45 +1,33 @@
-trilinos for Debian
+Trilinos for Debian
 -------------------
 
-Debian provides the following trilinos packages:
-
- - epetra
- - teuchos
- - triutils
- - anazazi
- - amesos
- - nox
- - loca
- - thyra
- - ml
- - belos
- - meros
- - sacado
-
-Debian Trilinos libraries renaming
-==================================
-
-Following a discussion with ftpmaster, the Trilinos libraries have
-been renamed to be less generic. They all use the same prefix now :
-libtrilinos_ . That should also help tremendously with
- - avoiding conflicts with other libraries/packages
- - identifying available trilinos libraries
+Debian provides all primary and secondary stable Trilinos packages.
 
 Linking with Trilinos
 =====================
 
-Trilinos provides a lot of libraries and the dependencies between them
-is not so trivial.
-Here is how to do it to compile ex1.cpp an example from NOX
+The most straightforward way to link against a Trilinos library is to
+use its CMake interface.
+Set
 
-g++ -o ex1 -I/usr/include/trilinos -I/usr/include/mpi -I../../src ex1.cpp
--ltrilinos_ml -ltrilinos_galeri -ltrilinos_nox -ltrilinos_noxepetra -ltrilinos_noxlapack -ltrilinos_anasazi
--ltrilinos_ifpack -ltrilinos_amesos -ltrilinos_aztecoo -ltrilinos_epetraext -ltrilinos_triutils -ltrilinos_epetra
--ltrilinos_teuchos -lexpat -llapack -lblas -lmpi++ -lmpi
+  FIND_PACKAGE(Trilinos REQUIRED)
 
-All these libraries are not strictly necessary of course.
+in your CMakeLists.txt. Typical compile-and-link statements would then
+include
 
+  INCLUDE_DIRECTORIES(${Trilinos_INCLUDE_DIRS}
+                      ${Trilinos_TPL_INCLUDE_DIRS})
 
+  LINK_DIRECTORIES(${Trilinos_LIBRARY_DIRS}
+                   ${Trilinos_TPL_LIBRARY_DIRS})
+  [...]
+  TARGET_LINK_LIBRARIES(${MY_EXECUTABLE}
+                        ${MY_LIBRARY}
+                        ${Trilinos_LIBRARIES}
+                        ${Trilinos_TPL_LIBRARIES})
 
+This will automatically pull in all the necessary libraries.
+If only a Trilinos subpackage is required, the same syntax holds true with
+"Trilinos" replaced by, e.g., "Teuchos".
 
- -- Christophe Prud'homme <prudhomm at debian.org>, Fri, 22 May 2009 10:41:11 +0200
+ -- Nico Schlömer <nico.schloemer at gmail.com>  Thu, 23 Aug 2012 11:55:35 +0200

Modified: packages/trilinos/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/changelog?rev=45896&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/changelog (original)
+++ packages/trilinos/trunk/debian/changelog Thu May 16 15:46:10 2013
@@ -1,4 +1,12 @@
-trilinos (10.8.5.dfsg-2) UNRELEASED; urgency=low
+trilinos (11.2.3.dfsg-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/rules:
+	- update extrea-flags thans to Nico Schlömer
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Thu, 16 May 2013 09:11:51 +0200
+
+trilinos (10.8.5.dfsg-2) unstable; urgency=low
 
   * debian/rules:
     - add override_dh_strip target to create dbg package

Modified: packages/trilinos/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/control?rev=45896&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/control (original)
+++ packages/trilinos/trunk/debian/control Thu May 16 15:46:10 2013
@@ -1,106 +1,116 @@
 Source: trilinos
+Homepage: http://trilinos.sandia.gov/
 Section: math
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>,
  Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
-Build-Depends: quilt (>=0.46-7), debhelper (>= 9), cmake, gfortran,
- mpi-default-dev, mpi-default-bin, libsuperlu3-dev, libsuitesparse-dev,
- python-dev (>= 2.6.6-3~), swig2.0, python-numpy, libexpat1-dev, libxml2-dev,
- chrpath
+# Trilinos can use Ubuntu's serial netCDF as well.
+Build-Depends: debhelper (>= 9), cmake, gfortran,
+ mpi-default-dev, mpi-default-bin, binutils-dev,
+ python-dev (>= 2.6.6-3~),
+ libblas-dev, liblapack-dev,
+ libboost-dev,
+ libeigen3-dev,
+ libhdf5-openmpi-dev (>= 1.8.7),
+ libmatio-dev (>= 1.3.4),
+ libmumps-dev (>= 4.7.3),
+ libnetcdf-dev (>= 4.1.3),
+ libptscotch-dev,
+ libtbb-dev,
+ python-mpi4py,
+ python-numpy,
+ swig,
+ zlib1g-dev
 Standards-Version: 3.9.3
-X-Python-Version: >= 2.5
-Homepage: http://trilinos.sandia.gov/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/trilinos/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk
+#Vcs-Git: git://git.debian.org/collab-maint/trilinos.git
+#Vcs-Browser: http://git.debian.org/?p=collab-maint/trilinos.git;a=summary
 
 Package: libtrilinos
+Architecture: any
 Section: libs
-Architecture: any
-Depends: libexpat1, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libtrilinos-doc
-Conflicts: libtrilinos6.0, libtrilinos7.0, libtrilinos8.0
-Replaces: libtrilinos6.0, libtrilinos7.0, libtrilinos8.0
-Description:  parallel solver libraries within an object-oriented software framework
- The Trilinos Project is an effort to develop and implement robust
- parallel algorithms using modern object-oriented software design,
- while still leveraging the value of established numerical libraries
- such as PETSc, Aztec, the BLAS and LAPACK. It emphasizes abstract
- interfaces for maximum flexibility of component interchanging, and
- provides a full-featured set of concrete classes that implement all
- abstract interfaces.
+Description: object-oriented framework for large-scale problems
+ The Trilinos Project is an effort to develop algorithms and enabling
+ technologies within an object-oriented software framework for the
+ solution of large-scale, complex multi-physics engineering and
+ scientific problems. A unique design feature of Trilinos is its
+ focus on packages.
  .
  This package contains the dynamic libraries.
 
 Package: libtrilinos-dev
+Architecture: any
 Section: libdevel
-Architecture: any
-Depends: libtrilinos (= ${binary:Version}), libexpat1-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: libtrilinos (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libtrilinos-doc
-Conflicts: libtrilinos6.0-dev, libtrilinos7.0-dev, libtrilinos8.0-dev
-Replaces: libtrilinos6.0-dev, libtrilinos7.0-dev, libtrilinos8.0-dev
-Description:  parallel solver libraries within an object-oriented software framework
- The Trilinos Project is an effort to develop and implement robust
- parallel algorithms using modern object-oriented software design,
- while still leveraging the value of established numerical libraries
- such as PETSc, Aztec, the BLAS and LAPACK. It emphasizes abstract
- interfaces for maximum flexibility of component interchanging, and
- provides a full-featured set of concrete classes that implement all
- abstract interfaces.
+Description: object-oriented framework for large-scale problems
+ The Trilinos Project is an effort to develop algorithms and enabling
+ technologies within an object-oriented software framework for the
+ solution of large-scale, complex multi-physics engineering and
+ scientific problems. A unique design feature of Trilinos is its
+ focus on packages.
  .
- This package contains the headers and static libraries.
+ This package provides headers.
 
 Package: libtrilinos-dbg
+Architecture: any
 Section: debug
-Architecture: any
-Depends: libtrilinos (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libtrilinos (= ${binary:Version})
 Suggests: libtrilinos-doc
-Conflicts: libtrilinos6.0-dbg, libtrilinos7.0-dbg, libtrilinos8.0-dbg
-Replaces: libtrilinos6.0-dbg, libtrilinos7.0-dbg, libtrilinos8.0-dbg
-Description:  parallel solver libraries within an object-oriented software framework
- The Trilinos Project is an effort to develop and implement robust
- parallel algorithms using modern object-oriented software design,
- while still leveraging the value of established numerical libraries
- such as PETSc, Aztec, the BLAS and LAPACK. It emphasizes abstract
- interfaces for maximum flexibility of component interchanging, and
- provides a full-featured set of concrete classes that implement all
- abstract interfaces.
+Description: object-oriented framework for large-scale problems
+ The Trilinos Project is an effort to develop algorithms and enabling
+ technologies within an object-oriented software framework for the
+ solution of large-scale, complex multi-physics engineering and
+ scientific problems. A unique design feature of Trilinos is its
+ focus on packages.
  .
- This package contains the debug symbols of the dynamic libraries.
+ These libraries are built with debug symbols. They are useful to debug
+ programs which use Trilinos. These must be used also at build/link time.
 
 Package: python-pytrilinos
 Section: python
 Architecture: any
-X-Python-Version: ${python:Versions}
+X-Python-Version: >= 2.2
 Depends: python-numpy, libtrilinos (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-Conflicts: python-pytrilinos7.0, python-pytrilinos8.0
-Replaces: python-pytrilinos7.0, python-pytrilinos8.0
-Description:  parallel solver libraries within an object-oriented software framework
- The Trilinos Project is an effort to develop and implement robust
- parallel algorithms using modern object-oriented software design,
- while still leveraging the value of established numerical libraries
- such as PETSc, Aztec, the BLAS and LAPACK. It emphasizes abstract
- interfaces for maximum flexibility of component interchanging, and
- provides a full-featured set of concrete classes that implement all
- abstract interfaces.
+Description: object-oriented framework for large-scale problems
+ The Trilinos Project is an effort to develop algorithms and enabling
+ technologies within an object-oriented software framework for the
+ solution of large-scale, complex multi-physics engineering and
+ scientific problems. A unique design feature of Trilinos is its
+ focus on packages.
  .
- This package contains the Python bindings for trilinos.
-
+ This package contains the Python bindings for Trilinos.
 
 Package: libtrilinos-doc
+Homepage: http://trilinos.sandia.gov/documentation.html
+Architecture: all
 Section: doc
-Architecture: all
 Depends: ${misc:Depends}
-Conflicts: libtrilinos6.0-doc, libtrilinos7.0-doc, libtrilinos8.0-doc
-Replaces: libtrilinos6.0-doc, libtrilinos7.0-doc, libtrilinos8.0-doc
-Description:  parallel solver libraries within an object-oriented software framework
- The Trilinos Project is an effort to develop and implement robust
- parallel algorithms using modern object-oriented software design,
- while still leveraging the value of established numerical libraries
- such as PETSc, Aztec, the BLAS and LAPACK. It emphasizes abstract
- interfaces for maximum flexibility of component interchanging, and
- provides a full-featured set of concrete classes that implement all
- abstract interfaces.
+Description: object-oriented framework for large-scale problems
+ The Trilinos Project is an effort to develop algorithms and enabling
+ technologies within an object-oriented software framework for the
+ solution of large-scale, complex multi-physics engineering and
+ scientific problems. A unique design feature of Trilinos is its
+ focus on packages.
  .
- This package contains some documentation and a tutorial.
+ This is documentation for the Trilinos libraries in HTML format.
+ Some pages point to header files provided in the corresponding -dev package,
+ so it is suggested to install the latter as well.
 
+Package: trilinos-bin
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libtrilinos-doc
+Description: object-oriented framework for large-scale problems
+ The Trilinos Project is an effort to develop algorithms and enabling
+ technologies within an object-oriented software framework for the
+ solution of large-scale, complex multi-physics engineering and
+ scientific problems. A unique design feature of Trilinos is its
+ focus on packages.
+ .
+ This package contains the executable binaries.

Modified: packages/trilinos/trunk/debian/libtrilinos-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/libtrilinos-dev.install?rev=45896&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/libtrilinos-dev.install (original)
+++ packages/trilinos/trunk/debian/libtrilinos-dev.install Thu May 16 15:46:10 2013
@@ -1,3 +1,4 @@
 debian/tmp/usr/lib/lib*.so
+#debian/tmp/usr/lib/lib*.a
 debian/tmp/usr/include/trilinos
 debian/tmp/usr/lib/cmake

Added: packages/trilinos/trunk/debian/patches/dist-packages.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/dist-packages.patch?rev=45896&op=file
==============================================================================
--- packages/trilinos/trunk/debian/patches/dist-packages.patch (added)
+++ packages/trilinos/trunk/debian/patches/dist-packages.patch Thu May 16 15:46:10 2013
@@ -1,0 +1,13 @@
+diff --git a/packages/PyTrilinos/src/CMakeLists.txt b/packages/PyTrilinos/src/CMakeLists.txt
+index 931b81e..023a46c 100644
+--- a/packages/PyTrilinos/src/CMakeLists.txt
++++ b/packages/PyTrilinos/src/CMakeLists.txt
+@@ -217,7 +217,7 @@ EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print sys.version[:
+   OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ SET(PyTrilinos_INSTALL_DIR
+-  ${PyTrilinos_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/PyTrilinos
++  ${PyTrilinos_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/dist-packages/PyTrilinos
+   CACHE PATH "The path where PyTrilinos will be installed"
+   )
+ MESSAGE(STATUS "PyTrilinos installation path: ${PyTrilinos_INSTALL_DIR}")

Added: packages/trilinos/trunk/debian/patches/install.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/install.patch?rev=45896&op=file
==============================================================================
--- packages/trilinos/trunk/debian/patches/install.patch (added)
+++ packages/trilinos/trunk/debian/patches/install.patch Thu May 16 15:46:10 2013
@@ -1,0 +1,13 @@
+Index: trilinos-11.2.3.dfsg/cmake/tribits/package_arch/TribitsGlobalMacros.cmake
+===================================================================
+--- trilinos-11.2.3.dfsg.orig/cmake/tribits/package_arch/TribitsGlobalMacros.cmake	2013-04-25 19:18:36.000000000 +0200
++++ trilinos-11.2.3.dfsg/cmake/tribits/package_arch/TribitsGlobalMacros.cmake	2013-05-16 15:29:58.000000000 +0200
+@@ -210,7 +210,7 @@
+       "If on, then the properter LINK_SEARCH_START_STATIC will be added to all executables." )
+   ENDIF()
+   
+-  ADVANCED_SET(${PROJECT_NAME}_INSTALL_INCLUDE_DIR "include"
++  ADVANCED_SET(${PROJECT_NAME}_INSTALL_INCLUDE_DIR "include/trilinos"
+     CACHE PATH
+     "Location where the headers will be installed.  If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}.  If given as an absolute path, it will used as such.  Default is 'include'"
+     )

Modified: packages/trilinos/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/series?rev=45896&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/series (original)
+++ packages/trilinos/trunk/debian/patches/series Thu May 16 15:46:10 2013
@@ -1,3 +1,3 @@
-hardening.patch
-soname.patch
-libname.patch
+dist-packages.patch
+sharedlibs.patch
+install.patch

Modified: packages/trilinos/trunk/debian/patches/sharedlibs.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/sharedlibs.patch?rev=45896&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/sharedlibs.patch (original)
+++ packages/trilinos/trunk/debian/patches/sharedlibs.patch Thu May 16 15:46:10 2013
@@ -1,16 +1,30 @@
-Index: trilinos-8.0.8/packages/PyTrilinos/shared/setup.py
+Index: trilinos-11.2.3.dfsg/Version.cmake
 ===================================================================
---- trilinos-8.0.8.orig/packages/PyTrilinos/shared/setup.py	2008-08-05 06:40:32.000000000 +0200
-+++ trilinos-8.0.8/packages/PyTrilinos/shared/setup.py	2008-08-05 06:54:30.000000000 +0200
-@@ -96,7 +96,10 @@
-     # Determine the installation information
-     mkdir      = makeMacros["mkdir_p"]
-     libDir     = makeMacros["libdir"]
--    installDir = os.path.join(destdir, libDir)
-+    installDir = destdir+libDir #os.path.join(destdir, libDir)
-+    print "\ndestdir: ", destdir, destdir+libDir
-+    print "\nlibDir: ", libDir
-+    print "\ninstallDir: ", installDir
+--- trilinos-11.2.3.dfsg.orig/Version.cmake	2013-04-25 19:18:36.000000000 +0200
++++ trilinos-11.2.3.dfsg/Version.cmake	2013-05-16 13:08:25.000000000 +0200
+@@ -61,6 +61,8 @@
  
-     ######################################################
-     # Build/clean/install/uninstall the shared libraries #
+ SET(Trilinos_VERSION 11.2.3)
+ SET(Trilinos_MAJOR_VERSION 11)
++SET(Trilinos_MINOR_VERSION 2)
++SET(Trilinos_PATCH_VERSION 3)
+ SET(Trilinos_MAJOR_MINOR_VERSION 110203)
+ SET(Trilinos_VERSION_STRING "11.2.3")
+ SET(Trilinos_ENABLE_DEVELOPMENT_MODE_DEFAULT OFF) # Change to 'OFF' for a release
+Index: trilinos-11.2.3.dfsg/cmake/tribits/package_arch/TribitsLibraryMacros.cmake
+===================================================================
+--- trilinos-11.2.3.dfsg.orig/cmake/tribits/package_arch/TribitsLibraryMacros.cmake	2013-04-25 19:18:35.000000000 +0200
++++ trilinos-11.2.3.dfsg/cmake/tribits/package_arch/TribitsLibraryMacros.cmake	2013-05-16 13:08:25.000000000 +0200
+@@ -303,7 +303,11 @@
+ 
+     SET_PROPERTY(TARGET ${LIBRARY_NAME} APPEND PROPERTY
+       LABELS ${PACKAGE_NAME})
+-
++    IF(BUILD_SHARED_LIBS)
++      SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES 
++         VERSION ${Trilinos_MAJOR_VERSION}.${Trilinos_MINOR_VERSION}.${Trilinos_PATCH_VERSION}
++         SOVERSION ${Trilinos_MAJOR_VERSION}.${Trilinos_MINOR_VERSION})
++    ENDIF()
+     PREPEND_GLOBAL_SET(${PARENT_PACKAGE_NAME}_LIB_TARGETS ${LIBRARY_NAME})
+     PREPEND_GLOBAL_SET(${PARENT_PACKAGE_NAME}_ALL_TARGETS ${LIBRARY_NAME})
+ 

Modified: packages/trilinos/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/rules?rev=45896&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/rules (original)
+++ packages/trilinos/trunk/debian/rules Thu May 16 15:46:10 2013
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 BUILDDIR = $(CURDIR)/debian/build
 
-TRILINOS_HOME = $(CURDIR)/$(DEB_SRCDIR)
 PYVERS := $(shell pyversions -dv)
 
 #include /usr/share/hardening-includes/hardening.make
@@ -11,65 +10,77 @@
 CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
-export CC=/usr/bin/mpicc
-export CXX=/usr/bin/mpic++
-#export CFLAGS=-g -fPIC -O2
-#export CXXFLAGS=-g -fPIC -O2
-#export FFLAGS=-g -fPIC -O2
-
-version=1.0
-version_major=1
+export CC=mpicc
+export CXX=mpic++
+export F90=mpif90
 
 
 %:
-	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR)--with python2 --parallel
+	dh $@ --buildsystem=cmake --with python2 --parallel
+
+# Note that, since this is a compat=9 package, the CPPFLAGS
+# don't have to be manually added to CFLAGS, CXXFLAGS;
+# cf. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653916,
+# http://wiki.debian.org/Hardening#Notes_for_packages_using_CMake.
+
+# Build most PS (primary-stable) and SS (secondary-stable) packages.
+# Add Trilinos_ASSERT_MISSING_PACKAGES=OFF for builds from the public
+# Git repository.
+#
+# Reasons for exclusion from build:
+#   * Optika: get rid of Qt dependency
+#   * TriKota: needs Dakota
+#   * FEI: File conflicts with existing package hypre.
+#
+# In similar packages, the headers are installed in the directory
+# /usr/include/<name of the package>/ rather than /usr/include/.
+# Historically, however, Trilinos uses this generic directory and it would
+# be hard to adapt all headers.
+# Trilinos' bug #5789 (cf. https://software.sandia.gov/bugzilla/show_bug.cgi?id=5789)
+# discusses this.
+#
+# Ubuntu doesn't have parallel netCDF in its default repository. Hence
+# SEACASExodus_ENABLE_MPI:BOOL=OFF.
+#
+# Amesos can make use of SuperLU, but only in version 4.1+, cf.
+# <http://trilinos.sandia.gov/packages/amesos/>. Consider adding
+#   -DTPL_ENABLE_SuperLU:BOOL=ON \
+#     -DTPL_SuperLU_INCLUDE_DIRS:PATH=/usr/include/superlu/ \
+# when SuperLU 4.1+ hits the tree.
+#
+# Disabling the Trilinos_ENABLE_DEVELOPMENT_MODE results in
+# cleaner compile flags. The same goes for CMAKE_BUILD_TYPE=None.
 
 extra_flags += \
-	-D Trilinos_ENABLE_ALL_PACKAGES:BOOL=ON \
-	-D Trilinos_ENABLE_SECONDARY_STABLE_CODE=OFF \
-	-D Trilinos_ENABLE_PyTrilinos:BOOL=ON \
-	-D Trilinos_ENABLE_TriKota:BOOL=OFF \
-	-D Trilinos_ENABLE_TESTS:BOOL=OFF \
-	-D Trilinos_ENABLE_EXAMPLES:BOOL=OFF \
-	-D CMAKE_BUILD_TYPE:STRING=DEBUG \
-	-D BUILD_SHARED_LIBS:BOOL=ON \
-	-D Trilinos_INSTALL_INCLUDE_DIR:PATH=include/trilinos \
-	-D TPL_ENABLE_MPI:BOOL=ON \
-	-D TPL_ENABLE_MATLAB:BOOL=OFF \
-        -D NOX_ENABLE_LAPACK:BOOL=ON \
-	-D SWIG_EXECUTABLE:FILEPATH=/usr/bin/swig2.0 \
-	$(TRILINOS_HOME)
+	-DTrilinos_ENABLE_ALL_PACKAGES:BOOL=ON \
+	-DTrilinos_ENABLE_SECONDARY_STABLE_CODE=OFF \
+	-DTrilinos_ENABLE_PyTrilinos:BOOL=ON \
+	-DTrilinos_ENABLE_TriKota:BOOL=OFF \
+	-DTrilinos_ENABLE_TESTS:BOOL=OFF \
+	-DTrilinos_ENABLE_EXAMPLES:BOOL=OFF \
+   	-DTPL_ENABLE_Eigen:BOOL=ON \
+     	-DTPL_Eigen_INCLUDE_DIRS:PATH=/usr/include/eigen3/ \
+	-DTPL_ENABLE_MPI:BOOL=ON \
+	-DTPL_ENABLE_MATLAB:BOOL=OFF \
+   	-DTrilinos_ENABLE_TriKota:BOOL=OFF \
+   	-DSEACASExodus_ENABLE_MPI:BOOL=OFF \
+        -DNOX_ENABLE_LAPACK:BOOL=ON \
+   	-DBUILD_SHARED_LIBS:BOOL=ON \
+   	-DCMAKE_BUILD_TYPE:STRING=DEBUG \
+   	-DTrilinos_ASSERT_MISSING_PACKAGES:BOOL=OFF
 
 override_dh_auto_clean:
-	dh_quilt_unpatch
-	-find $(CURDIR) -name "*.pyc" | xargs rm -f
-	-find $(CURDIR) -name "Makefile.orig" | xargs rm -f
 	for v in $(PYVERS); do \
 	   rm -rf $(BUILDDIR)$$v; \
 	done
-
-	-rm packages/stk/stk_percept/stk_percept/sparsehash/config.status
-	-rm -rf SIERRA/bjam
-
+	-find $(CURDIR) -name "*.pyc" | xargs rm -f
 
 override_dh_auto_configure:
-# create a backup copy of files to enable rebuild
-	-cp cmake/python/data/CDashSubprojectDependencies.xml cmake/python/data/CDashSubprojectDependencies.xml.bck
-	-cp cmake/python/data/TrilinosPackageDependencies.xml cmake/python/data/TrilinosPackageDependencies.xml.bck
-	-cp cmake/python/data/TrilinosPackageDependenciesTable.html cmake/python/data/TrilinosPackageDependenciesTable.html.bck
-	-cp packages/nox/doc/Doxyfile packages/nox/doc/Doxyfile.bck
-
-	dh_quilt_patch
 	for v in $(PYVERS); do \
 	dh_auto_configure --builddirectory=$(BUILDDIR)$$v \
 	   -- $(extra_flags) \
 	   -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python$$v ;\
 	done
-
-	-mv -f cmake/python/data/CDashSubprojectDependencies.xml.bck cmake/python/data/CDashSubprojectDependencies.xml
-	-mv -f cmake/python/data/TrilinosPackageDependencies.xml.bck cmake/python/data/TrilinosPackageDependencies.xml
-	-mv -f cmake/python/data/TrilinosPackageDependenciesTable.html.bck cmake/python/data/TrilinosPackageDependenciesTable.html
-	-mv -f packages/nox/doc/Doxyfile.bck packages/nox/doc/Doxyfile
 
 override_dh_auto_build:
 	for v in $(PYVERS); do \
@@ -81,7 +92,7 @@
 	   dh_auto_install --builddirectory=$(BUILDDIR)$$v; \
 	done
 	
-	find debian/tmp -name \*.so.10.10.2 | xargs -r chrpath -d
+	find debian/tmp -name \*.so.11.2.3 | xargs -r chrpath -d
 	dh_python2 --no-guessing-versions -ppython-pytrilinos
 	
 #install/libtrilinos-doc::




More information about the debian-science-commits mailing list