[Pkg-scicomp-devel] trilinos/trunk/debian

[Christophe Prud'homme]

SVN commit 1975 by prudhomm:

fix build and support for solibs

 M  +3 -3      trilinos/trunk/debian/patches/destdir  
 A             trilinos/trunk/debian/patches/makefile.patch  
 M  +1 -0      trilinos/trunk/debian/patches/series  
 M  +10 -2     trilinos/trunk/debian/rules  


--- trilinos/trunk/debian/patches/destdir #1974:1975
@@ -1,7 +1,7 @@
-Index: trilinos-8.0.1/Makefile.am
+Index: trilinos/Makefile.am
 ===================================================================
---- trilinos-8.0.1.orig/Makefile.am	2007-09-06 15:06:15.752795409 +0200
-+++ trilinos-8.0.1/Makefile.am	2007-09-06 15:06:38.256723021 +0200
+--- trilinos.orig/Makefile.am	2007-09-25 21:10:10.000000000 +0200
++++ trilinos/Makefile.am	2007-09-25 21:10:11.000000000 +0200
 @@ -111,12 +111,12 @@
  ## #######################################################################
  
--- trilinos/trunk/debian/patches/series #1974:1975
@@ -1 +1,2 @@
 destdir
+makefile.patch
--- trilinos/trunk/debian/rules #1974:1975
@@ -24,8 +24,8 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/tarball.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_BUILDDIR 			:= $(DEB_SRCDIR)/
 DEB_CONFIGURE_SCRIPT		:= $(CURDIR)/configure
@@ -77,7 +77,15 @@
 
 #TRILINOS_PACKAGES=anasazi amesos aztecoo epetra epetraext ifpack ml new_package teuchos triutils  thyra
 
+build/libtrilinos::
+	cd $(DEB_BUILDDIR)/packages/PyTrilinos/shared  && $(MAKE)
 
+install/libtrilinos::
+	-for i in $(DEB_BUILDDIR)/packages/PyTrilinos/shared/lib*.so; do \
+           install $$i debian/tmp/usr/lib/; \
+         done
+
+
 # install/libtrilinos::
 # 	-(for i in $(TRILINOS_PACKAGES); do \
 #         gcc -shared -Wl,-soname,lib$$i.so.$(version_major) -o debian/tmp/usr/lib/lib$$i.so.$(version) `find $(DEB_BUILDDIR)packages/$$i/src/ -name "*.o"`; \