[getdp] 17/20: d/rules: semplify it

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository getdp.

commit 8150d61d4b977e9f024143c566f120b0da073d11
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri Feb 12 19:41:53 2016 +0000

    d/rules: semplify it
---
 debian/rules | 65 ++++++++++++++++--------------------------------------------
 1 file changed, 17 insertions(+), 48 deletions(-)

diff --git a/debian/rules b/debian/rules
index 604a561..b98a3a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,68 +1,38 @@
 #!/usr/bin/make -f
 
-BUILDDIR = $(CURDIR)/debian/build
-DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
+BUILDDIR_PETSC = $(CURDIR)/debian/build/petsc
+BUILDDIR_SPARSKIT = $(CURDIR)/debian/build/sparskit
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic -O3 -march=native -mtune=native
 export DEB_CXXFLAGS_MAINT_APPEND  = -Wall -pedantic -O3 -march=native -mtune=native
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-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.1
-export PETSC_DIR=/usr/lib/petscdir/3.6.1
-
-# 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
 
-%:
-	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --parallel
 export OMPI_MCA_plm_rsh_agent=/bin/false                #workaround to start MPI-applications in chroot
 
-disable_mpi_archs = armel armhf kfreebsd-amd64 kfreebsd-i386 mips mipsel
-export LD_LIBRARY_PATH :=  $(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH);
-
-ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_mpi_archs)))
-	extra_flags += \
-	-DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lmpi -fPIC \
-	                   -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
-	-DENABLE_MPI:BOOL=ON
-else
-	extra_flags += \
-	-DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -fPIC \
-	                   -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
-	-DENABLE_MPI:BOOL=OFF
-endif
-
-extra_flags_sparskit = $(extra_flags) -DCMAKE_EXE_LINKER_FLAGS:STRING="$(shell dpkg-buildflags --get LDFLAGS) -Wl,--no-as-needed -lgfortran"
+%:
+	dh $@ --parallel
 
 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
+	dh_auto_configure --builddirectory=$(BUILDDIR_PETSC) -O--parallel -- -DENABLE_MPI:BOOL=ON -DENABLE_PETSC=1 -DENABLE_SPARSKIT=0
+	dh_auto_configure --builddirectory=$(BUILDDIR_SPARSKIT) -O--parallel -- -DENABLE_MPI:BOOL=ON -DENABLE_PETSC=0 -DENABLE_SPARSKIT=1
+	sed -i 's/-lpthread/-lgfortran -lpthread/' debian/build/*/CMakeFiles/getdp.dir/link.txt
 
 
 override_dh_auto_build:
-	echo "installing getdp"
-	dh_auto_build  --builddirectory=$(BUILDDIR)/petsc
-	echo "installing getdp-sparskit"
-	dh_auto_build  --builddirectory=$(BUILDDIR)/sparskit
-	mv $(BUILDDIR)/sparskit/getdp $(BUILDDIR)/sparskit/getdp-sparskit
+	@echo "Building getdp"
+	dh_auto_build -O--parallel --builddirectory=$(BUILDDIR_PETSC)
+	@echo "Building getdp-sparskit"
+	dh_auto_build -O--parallel --builddirectory=$(BUILDDIR_SPARSKIT)
+	mv $(BUILDDIR_SPARSKIT)/getdp $(BUILDDIR_SPARSKIT)/getdp-sparskit
 
 override_dh_auto_install:
-	echo "installing getdp"
-	dh_auto_install  --builddirectory=$(BUILDDIR)/petsc
-
-#override_dh_shlibdeps:
-#	echo "dh_shlibdeps skipped"
+	@echo "Installing getdp"
+	dh_auto_install -O--parallel --builddirectory=$(BUILDDIR_PETSC)
 
 override_dh_auto_clean:
-	rm -rf $(BUILDDIR)/petsc $(BUILDDIR)/sparskit
+	dh_auto_clean
+	rm -rf $(BUILDDIR_PETSC) $(BUILDDIR_SPARSKIT)
 
 override_dh_installdocs:
 	dh_installdocs --all README.txt
@@ -71,7 +41,6 @@ override_dh_installdocs:
 DEB_SOURCE_PACKAGE = $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
 DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p' | cut -f 1 -d '-')
 DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
-
 get-orig-source:
 	set -ex ; \
         mkdir -p tmp ; \

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