[petsc] 01/07: debian/rules: only print the configure log of failed builds.

Drew Parsons dparsons at moszumanska.debian.org
Fri Mar 11 23:04:04 UTC 2016


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

dparsons pushed a commit to branch master
in repository petsc.

commit e566aea60de137c94946f2221c7e2cb30ab5fb32
Author: Drew Parsons <dparsons at debian.org>
Date:   Fri Mar 11 22:19:54 2016 +0800

    debian/rules: only print the configure log of failed builds.
    
    Thanks Matthias Klose for the patch.
    Closes: #811257.
---
 debian/changelog |  8 ++++++++
 debian/rules     | 40 ++++++++++++++++++++++++++++++++--------
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 268a7ef..75b0d7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+petsc (3.6.3.dfsg1-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+  * debian/rules: only print the configure log of failed builds.
+    Closes: #811257. 
+
+ -- Drew Parsons <dparsons at debian.org>  Fri, 11 Mar 2016 22:16:50 +0800
+
 petsc (3.6.2.dfsg1-3) unstable; urgency=medium
 
   * Add Depends: libssl-dev, libgfortran-5-dev to petsc dev packages.
diff --git a/debian/rules b/debian/rules
index 177454d..d223afb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -126,7 +126,8 @@ override_dh_auto_clean:
 
 
 override_dh_auto_configure:
-	dh_auto_configure -p$(PETSC_DEBUG_PACKAGE) --  \
+	@echo ===================== $(PETSC_DEBUG_PACKAGE) =====================
+	if dh_auto_configure -p$(PETSC_DEBUG_PACKAGE) --  \
           --with-debugging=1  \
           --shared-library-extension=_real \
           --with-hypre=1 --with-hypre-dir=/usr --with-clanguage=C++ --with-c-support \
@@ -135,8 +136,14 @@ override_dh_auto_configure:
           PETSC_DIR=$(CURDIR) --PETSC_ARCH=$(PETSC_DEBUG_BUILD_DIR) \
             CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
             FCFLAGS="$(FCFLAGS)"  FFLAGS="$(FFLAGS)"  \
-            CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" MAKEFLAGS="$(MAKEFLAGS)"
-	dh_auto_configure -p$(PETSC_VERSIONED_DEV_PACKAGE) --  \
+            CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" MAKEFLAGS="$(MAKEFLAGS)"; then \
+	  : ; \
+	else \
+	  cat configure.log; \
+	  false; \
+	fi
+	@echo ===================== $(PETSC_VERSIONED_DEV_PACKAGE) =====================
+	if dh_auto_configure -p$(PETSC_VERSIONED_DEV_PACKAGE) --  \
           --with-debugging=0  \
           --shared-library-extension=_real \
           --with-hypre=1 --with-hypre-dir=/usr --with-clanguage=C++ --with-c-support \
@@ -145,8 +152,14 @@ override_dh_auto_configure:
           PETSC_DIR=$(CURDIR) --PETSC_ARCH=$(PETSC_BUILD_DIR) \
             CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
             FCFLAGS="$(FCFLAGS)"  FFLAGS="$(FFLAGS)"  \
-            CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" MAKEFLAGS="$(MAKEFLAGS)"
-	dh_auto_configure -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE) --  \
+            CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" MAKEFLAGS="$(MAKEFLAGS)"; then \
+	  : ; \
+	else \
+	  cat configure.log; \
+	  false; \
+	fi
+	@echo ===================== $(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE) =====================
+	if dh_auto_configure -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE) --  \
           --with-debugging=0  \
           --with-scalar-type=complex --shared-library-extension=_complex \
           $(CONFIGURATION_OPTIONS)  \
@@ -154,8 +167,14 @@ override_dh_auto_configure:
           PETSC_DIR=$(CURDIR) --PETSC_ARCH=$(PETSC_COMPLEX_BUILD_DIR) \
             CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
             FCFLAGS="$(FCFLAGS)"  FFLAGS="$(FFLAGS)"  \
-            CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" MAKEFLAGS="$(MAKEFLAGS)"
-	dh_auto_configure -p$(PETSC_COMPLEX_DEBUG_PACKAGE) --  \
+            CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" MAKEFLAGS="$(MAKEFLAGS)"; then \
+	  : ; \
+	else \
+	  cat configure.log; \
+	  false; \
+	fi
+	@echo ===================== $(PETSC_COMPLEX_DEBUG_PACKAGE) =====================
+	if dh_auto_configure -p$(PETSC_COMPLEX_DEBUG_PACKAGE) --  \
           --with-debugging=1  \
           --with-scalar-type=complex --shared-library-extension=_complex \
           $(CONFIGURATION_OPTIONS)  \
@@ -163,7 +182,12 @@ override_dh_auto_configure:
           PETSC_DIR=$(CURDIR) --PETSC_ARCH=$(PETSC_COMPLEX_DEBUG_BUILD_DIR) \
             CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
             FCFLAGS="$(FCFLAGS)"  FFLAGS="$(FFLAGS)"  \
-            CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" MAKEFLAGS="$(MAKEFLAGS)"
+            CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" MAKEFLAGS="$(MAKEFLAGS)"; then \
+	  : ; \
+	else \
+	  cat configure.log; \
+	  false; \
+	fi
 
 
 override_dh_auto_build:

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



More information about the debian-science-commits mailing list