[hdf5] 01/02: Build -doc package only on archs where php5-cli is available

Mon Feb 22 13:34:24 UTC 2016

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

pini pushed a commit to branch master
in repository hdf5.

commit fe41663d1bcf648f9d999cd0f64b7939c5270f71
Author: Gilles Filippini <pini at debian.org>
Date:   Sun Feb 21 20:56:15 2016 +0100

    Build -doc package only on archs where php5-cli is available
    
    [!m68k !sh4]
---
 debian/changelog  |  7 +++++++
 debian/control    |  3 ++-
 debian/control.in |  3 ++-
 debian/rules      | 35 +++++++++++++++++++++++++++--------
 4 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13beb44..234e23e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hdf5 (1.8.16+docs-5) UNRELEASED; urgency=medium
+
+  * Build -doc package only on archs where php5-cli is available:
+    [!m68k !sh4].
+
+ -- Gilles Filippini <pini at debian.org>  Sun, 21 Feb 2016 20:54:07 +0100
+
 hdf5 (1.8.16+docs-4) unstable; urgency=medium
 
   * Support openmpi for any arch but m68k (closes: #814329).
diff --git a/debian/control b/debian/control
index 63ecd24..0d6de2c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
  Gilles Filippini <pini at debian.org>
 Build-Depends: dpkg-dev (>= 1.16.1~), mpi-default-dev, libmpich-dev, zlib1g-dev,
  libjpeg-dev, debhelper (>= 9~), gfortran,
- sharutils, chrpath, autotools-dev, automake, dh-autoreconf, doxygen, php5-cli,
+ sharutils, chrpath, autotools-dev, automake, dh-autoreconf,
+ doxygen [!m68k !sh4], php5-cli [!m68k !sh4],
  libaec-dev,
 Standards-Version: 3.9.6
 Homepage: http://hdfgroup.org/HDF5/
diff --git a/debian/control.in b/debian/control.in
index fdf3aaa..26a4575 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,7 +6,8 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
  Gilles Filippini <pini at debian.org>
 Build-Depends: dpkg-dev (>= 1.16.1~), mpi-default-dev, libmpich-dev, zlib1g-dev,
  libjpeg-dev, debhelper (>= 9~), gfortran,
- sharutils, chrpath, autotools-dev, automake, dh-autoreconf, doxygen, php5-cli,
+ sharutils, chrpath, autotools-dev, automake, dh-autoreconf,
+ doxygen [@NODOCARCHS@], php5-cli [@NODOCARCHS@],
  libaec-dev,
 Standards-Version: 3.9.6
 Homepage: http://hdfgroup.org/HDF5/
diff --git a/debian/rules b/debian/rules
index 9a21b12..9494e82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,6 +98,17 @@ build_stamp_mpich =
 install_mpich =
 endif
 
+# Don't build doc on archs where php5-cli is not available:
+NODOCARCHS ?= !m68k !sh4
+ifeq (,$(filter !$(DEB_HOST_ARCH),$(NODOCARCHS)))
+build_stamp_doc = build-stamp-doc
+install_doc = install-doc
+else
+build_stamp_doc =
+install_doc =
+export DH_OPTIONS += -Nlibhdf5-doc
+endif
+
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        USE_PROD = yes
 else
@@ -160,7 +171,6 @@ configure-stamp-debian: debian/control.in
 	mkdir -p m4
 	dh_autoreconf
 	touch $@
-	echo "builddeps:Built-Using=doxygen (= $$(dpkg-query -W -f='$${source:Version}' doxygen))" >>debian/libhdf5-doc.substvars
 
 configure-stamp: configure-stamp-debian
 	dh_testdir
@@ -169,9 +179,6 @@ configure-stamp: configure-stamp-debian
 	cd debian/build && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" CC=/usr/bin/cc CXX=/usr/bin/c++ FC=gfortran \
 		H5_LDFLAGS="-Wl,--version-script,\$$(top_srcdir)/debian/map_serial.ver" \
 		../../configure $(CONFIGURE_FLAGS) $(SERIAL_FLAGS) || { cat config.log; exit 1; }
-	# Upgrade the doxygen configuration file
-	cp c++/src/cpp_doc_config c++/src/cpp_doc_config_u
-	cd c++/src && doxygen -s -u cpp_doc_config_u
 	touch $@
 
 configure-stamp-openmpi: configure-stamp-debian
@@ -207,7 +214,7 @@ prep:
 
 build: build-arch build-indep
 build-arch: build-stamp $(build_stamp_openmpi) $(build_stamp_mpich)
-build-indep: build-stamp-doc
+build-indep: $(build_stamp_doc)
 
 build-stamp: configure-stamp
 	dh_testdir
@@ -225,6 +232,11 @@ build-stamp-mpich: configure-stamp-mpich
 	touch $@
 
 build-stamp-doc: configure-stamp
+	echo "builddeps:Built-Using=doxygen (= $$(dpkg-query -W -f='$${source:Version}' doxygen))" >>debian/libhdf5-doc.substvars
+	# Upgrade the doxygen configuration file
+	cp c++/src/cpp_doc_config c++/src/cpp_doc_config_u
+	cd c++/src && doxygen -s -u cpp_doc_config_u
+	# Generate doc
 	cd c++/src && doxygen cpp_doc_config_u >/dev/null
 	rm -rf html/cpplus_RM
 	mv c++/src/cpplus_RM html/cpplus_RM
@@ -242,7 +254,14 @@ clean:
 	-rm -rf debian/build
 	-rm -rf debian/build-openmpi
 	-rm -rf debian/build-mpich
-	grep -v ^\% debian/control.in | sed -e "s/@SONAME@/$(SONAME)/g" -e "s/@SONAME_CXX@/$(SONAME_CXX)/g" -e "s/@OMPIARCHS@/$(filter-out !%,$(OMPIARCHS))/" -e "s/@MPICHARCHS@/$(filter-out !%,$(MPICHARCHS))/" -e "s/@MAJOR_VERSION@/$(major_version)/" > debian/control
+	grep -v ^\% debian/control.in | sed \
+	  -e "s/@SONAME@/$(SONAME)/g" \
+	  -e "s/@SONAME_CXX@/$(SONAME_CXX)/g" \
+	  -e "s/@OMPIARCHS@/$(filter-out !%,$(OMPIARCHS))/" \
+	  -e "s/@MPICHARCHS@/$(filter-out !%,$(MPICHARCHS))/" \
+	  -e "s/@MAJOR_VERSION@/$(major_version)/" \
+	  -e "s/@NODOCARCHS@/$(NODOCARCHS)/g" \
+	  > debian/control
 	dh_autoreconf_clean
 	rm -f m4/l*
 	-cd debian && rm -f `ls libhdf5-*.install libhdf5-*.shlibs libhdf5-*.doc | grep -v 'libhdf5-doc'`
@@ -253,7 +272,7 @@ clean:
 	-rm -f debian/man/h5pfc.*.1
 	dh_clean configure-stamp* build-stamp* install-stamp*
 
-install: build prep install-serial $(install_openmpi) $(install_mpich) install-doc
+install: build prep install-serial $(install_openmpi) $(install_mpich) $(install_doc)
 
 install-serial: build-stamp
 	dh_testdir
@@ -305,7 +324,7 @@ install-doc: build-indep
 	  -execdir /bin/sh -c "/usr/bin/php -f '{}' > '{}.new'" \; \
 	  -exec mv "{}.new" "{}" \;
 
-binary-indep: install-doc
+binary-indep: $(install-doc)
 	dh_testdir
 	dh_testroot
 	dh_installdocs -i

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git

