[sundials] 01/01: stash

[Dima Kogan]

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

dkogan-guest pushed a commit to branch stash
in repository sundials.

commit 3eb7425d3054d09a90855a9a3ca2c7ae734106eb
Author: Dima Kogan <dima at secretsauce.net>
Date:   Tue Oct 11 00:15:00 2016 -0700

    stash
---
 debian/libsundials-serial-dev.install |  4 +--
 debian/rules                          | 60 ++++++++++++++++++++++++-----------
 2 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/debian/libsundials-serial-dev.install b/debian/libsundials-serial-dev.install
index ef2e63d..074348e 100644
--- a/debian/libsundials-serial-dev.install
+++ b/debian/libsundials-serial-dev.install
@@ -20,6 +20,6 @@ usr/include/kinsol
 usr/include/nvector/nvector_serial.h
 usr/include/sundials
 
-bin/sundials-config usr/bin
+#bin/sundials-config usr/bin
 
-debian/sundials-config.1 usr/share/man/man1
+#debian/sundials-config.1 usr/share/man/man1
diff --git a/debian/rules b/debian/rules
index fef4d82..a62d161 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,41 +3,63 @@
 #workaround to start MPI-applications in chroot
 export OMPI_MCA_plm_rsh_agent=/bin/false
 
-extra_flags += \
-   -DCMAKE_Fortran_COMPILER=gfortran \
-   -DBUILD_SHARED_LIBS:BOOL=ON \
-   -DFCMIX_ENABLE:BOOL=ON \
-   -DMPI_ENABLE:BOOL=ON \
-   -DLAPACK_ENABLE:BOOL=ON \
-   -DEXAMPLES_ENABLE:BOOL=ON \
-   -DEXAMPLES_INSTALL:BOOL=OFF
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
-BUILDDIR = $(CURDIR)/debian/build
+# # PETSc include directory: I ask pkg-config about all the cflags I need, then
+# # look through all the include directories it gives me, and report the one that
+# # has petsc.h
+# PETSC_INCLUDE_DIR := $(patsubst %/petsc.h,%,$(wildcard $(addsuffix /petsc.h,$(patsubst -I%,%,$(filter -I%,$(shell pkg-config --cflags PETSc))))))
+# $(if $(PETSC_INCLUDE_DIR),,$(error Could not find PETSc include directory))
+# Build-Depends: libpetsc3.7.3-dev, libsuitesparse-dev
+
+extra_flags +=						\
+   -DCMAKE_Fortran_COMPILER=gfortran			\
+   -DBUILD_SHARED_LIBS:BOOL=ON				\
+   -DBUILD_STATIC_LIBS:BOOL=ON				\
+   -DFCMIX_ENABLE:BOOL=ON				\
+   -DMPI_ENABLE:BOOL=ON					\
+   -DLAPACK_ENABLE:BOOL=ON				\
+							\
+   -DEXAMPLES_ENABLE:BOOL=ON				\
+   -DEXAMPLES_INSTALL:BOOL=OFF				\
+							\
+   -DOPENMP_ENABLE:BOOL=OFF				\
+   -DPTHREAD_ENABLE:BOOL=OFF				\
+							\
+   -DKLU_ENABLE:BOOL=OFF				\
+   -DKLU_INCLUDE_DIR=/usr/include/suitesparse		\
+   -DKLU_LIBRARY_DIR=/usr/lib/$(DEB_HOST_GNU_TYPE)	\
+							\
+   -DPETSC_ENABLE:BOOL=OFF				\
+   -DPETSC_INCLUDE_DIR=$(PETSC_INCLUDE_DIR)		\
+   -DPETSC_LIBRARY_DIR=/usr/lib/$(DEB_HOST_GNU_TYPE)	\
+							\
+   -DSUPERLUMT_ENABLE:BOOL=OFF				\
+   -DHYPRE_ENABLE:BOOL=OFF
 
 
+BUILDDIR = $(CURDIR)/debian/build
+
 %:
 	dh $@ --buildsystem=cmake  --builddirectory=$(BUILDDIR) --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(extra_flags)
 
-override_dh_auto_test:
-	dh_auto_test
-	echo "Running test..."
-	$(SHELL) debian/check.sh $(BUILDDIR) $(CURDIR)
+# override_dh_auto_test:
+# 	dh_auto_test
+# 	echo "Running test..."
+# 	$(SHELL) debian/check.sh $(BUILDDIR) $(CURDIR)
 
 override_dh_auto_install:
 	dh_auto_install
-	dh_install -a -Nlibsundials-doc
-	dh_install -plibsundials-doc -X.txt -X.out -X.in -XREADME
+	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_GNU_TYPE)
+	mv debian/tmp/usr/lib/lib* debian/tmp/usr/lib/$(DEB_HOST_GNU_TYPE)
 
 #
 #to generate symbols
 #	dpkg-gensymbols -plibsundials-parallel -O
 
 override_dh_auto_clean:
-	find examples \
-	        -type f -a  \( -name \*.o \)	\
-		-a -exec rm -f \{\} \;
-	rm -rf bin/makefile-update.sh
 	dh_auto_clean
+	rm -rf $(BUILDDIR)

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