[giac] 02/03: Split the arch/indep builds to try to avoid spurious doc build errors

Ximin Luo infinity0 at debian.org
Tue Jun 20 21:45:50 UTC 2017


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

infinity0 pushed a commit to branch master
in repository giac.

commit aeaaf8defb525f4aaf50e8c32ba58150a1483b6e
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Jun 20 20:29:45 2017 +0200

    Split the arch/indep builds to try to avoid spurious doc build errors
---
 debian/TODO      | 17 +++++++++++++++++
 debian/changelog |  7 +++++++
 debian/clean     |  1 +
 debian/control   |  1 +
 debian/rules     | 34 ++++++++++++++++++++++++++++++++++
 5 files changed, 60 insertions(+)

diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..58b91a1
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,17 @@
+Random issues
+=============
+
+Docs fail to build sometimes
+----------------------------
+
+e.g. see https://buildd.debian.org/status/logs.php?pkg=giac specifically:
+
+- 1.2.3.25+dfsg1-3 armhf mipsel failed (amd64 succeeded)
+- 1.2.3.25+dfsg1-2 armhf mipsel succeeded
+
+grep the logs for "Fatal error occurred, no output PDF file produced!", these
+seem to be due to extra "$$$" in algo_.tex, generated by HEVEA from algo.tex.
+Only two $$ is allowed and is what exists in algo.tex
+
+Probably a HEVEA problem but I can't be bothered chasing it down further, the
+build scripts and code are too messy to deal with.
diff --git a/debian/changelog b/debian/changelog
index ce69e60..128e244 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+giac (1.2.3.25+dfsg1-4) UNRELEASED; urgency=medium
+
+  * Split arch-dependent vs -independent builds to try to avoid failures
+    building the documentation on some architectures.
+
+ -- Ximin Luo <infinity0 at debian.org>  Tue, 20 Jun 2017 16:19:44 +0200
+
 giac (1.2.3.25+dfsg1-3) unstable; urgency=medium
 
   * Add missing depends from libgiac-dev on libgiac0. (Closes: #856949)
diff --git a/debian/clean b/debian/clean
index 66312e3..983a5ac 100644
--- a/debian/clean
+++ b/debian/clean
@@ -2,6 +2,7 @@ doc/giac.js
 doc/fr/
 doc/*/texinfo.tex
 doc/texinfo.tex
+check/*.tst
 src/input_lexer.cc
 src/lexer.h
 src/input_parser.cc
diff --git a/debian/control b/debian/control
index 577599b..e58921d 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Build-Depends:
  libxext-dev,
  libxft-dev,
  libxinerama-dev,
+Build-Depends-Indep:
  hevea <!nodoc>,
  imagemagick <!nodoc>,
  latex2html <!nodoc>,
diff --git a/debian/rules b/debian/rules
index 2fa8f72..4e05af8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,18 @@
 %:
 	dh "$@" --with autoreconf
 
+# Use ccache if pkg.giac.ccache build-profile is active.
+# Your rebuilds will be *much quicker*.
+ifneq (,$(filter pkg.giac.ccache,$(DEB_BUILD_PROFILES)))
+export PATH := /usr/lib/ccache:$(PATH)
+export CCACHE_DIR := $(CURDIR)/debian/ccache
+#export CCACHE_BASEDIR := $(CURDIR)/debian/build
+$(shell mkdir -p "$(CCACHE_DIR)")
+endif
+
+# ~/.xcasrc sometimes interferes with doc/test targets, causing failures
+export HOME=/nonexistent
+
 override_dh_autoreconf:
 # Deal with embedded stuff
 	find doc/ -maxdepth 1 -type d -exec ln -sf /usr/share/texmf/tex/texinfo/texinfo.tex '{}/' \;
@@ -17,6 +29,28 @@ override_dh_autoreconf:
 # Actually configure
 	dh_autoreconf
 
+override_dh_auto_build-arch:
+# Should be the same order as SUBDIRS in Makefile.am
+	dh_auto_build -a -D src
+	dh_auto_build -a -D intl
+	dh_auto_build -a -D po
+	dh_auto_build -a -D doc -- info
+
+override_dh_auto_test-arch:
+	dh_auto_test -a -D check
+
+override_dh_auto_test-indep:
+	true
+
+override_dh_auto_install-arch:
+# Should be the same order as SUBDIRS in Makefile.am
+	dh_auto_install -a -D src
+	dh_auto_install -a -D intl
+	dh_auto_install -a -D po
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp AM_UPDATE_INFO_DIR=no -C doc \
+	  install-info install-dist_pkgdataDATA
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install-exec-hook
+
 override_dh_install:
 	rm -f debian/tmp/usr/lib/*/libgiac.la
 	rm -f debian/tmp/usr/include/giac/config.h

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



More information about the debian-science-commits mailing list