Bug#981786: libtommath: separate arch vs indep build

[Helmut Grohne]

Source: libtommath
Version: 1.2.0-5
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

libtommath participates in dependency loop relevant to architecture
bootstrap. Instead of looking into such a difficult problem, I noticed
that libtommath could separate the documentation build from the library
build and thereby demote a pile of dependencies to B-D-I. Please
consider applying the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru libtommath-1.2.0/debian/changelog libtommath-1.2.0/debian/changelog
--- libtommath-1.2.0/debian/changelog	2020-07-30 14:56:24.000000000 +0200
+++ libtommath-1.2.0/debian/changelog	2021-02-03 20:16:30.000000000 +0100
@@ -1,3 +1,10 @@
+libtommath (1.2.0-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Separate arch build from indep build. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 03 Feb 2021 20:16:30 +0100
+
 libtommath (1.2.0-5) unstable; urgency=medium
 
   * make autopkgtests cross-test-friendly.
diff --minimal -Nru libtommath-1.2.0/debian/control libtommath-1.2.0/debian/control
--- libtommath-1.2.0/debian/control	2020-07-30 14:56:24.000000000 +0200
+++ libtommath-1.2.0/debian/control	2021-02-03 20:16:30.000000000 +0100
@@ -5,9 +5,10 @@
 Priority: optional
 Build-Depends: autoconf,
                debhelper-compat (= 12),
+               libtool,
+Build-Depends-Indep:
                ghostscript,
                libtiff-tools,
-               libtool,
                texlive-latex-extra,
                texlive-latex-recommended
 Standards-Version: 4.5.0
diff --minimal -Nru libtommath-1.2.0/debian/rules libtommath-1.2.0/debian/rules
--- libtommath-1.2.0/debian/rules	2020-07-30 14:56:24.000000000 +0200
+++ libtommath-1.2.0/debian/rules	2021-02-03 20:16:30.000000000 +0100
@@ -24,9 +24,8 @@
 %:
 	dh $@
 
-override_dh_auto_build:
+override_dh_auto_build-arch:
 	echo "removing files built upstream"
-	rm -f doc/bn.pdf
 	rm -rf pre_gen
 	echo "Creating libtool executable"
 	mkdir debian/libtool
@@ -36,10 +35,15 @@
 
 	echo "Building libtommath"
 	dh_auto_build --buildsystem=makefile -- -f makefile.shared LIBTOOL=$(CURDIR)/debian/libtool/libtool
+
+override_dh_auto_build-indep:
+	echo "removing files built upstream"
+	rm -f doc/bn.pdf
+
 	echo "Building docs"
 	$(MAKE) docs V=1
 
-override_dh_auto_test:
+override_dh_auto_test-arch:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	echo "compiling test programs"
 	$(MAKE) -f makefile.shared LIBTOOL=$(CURDIR)/debian/libtool/libtool test_standalone
@@ -47,14 +51,15 @@
 	./test
 endif
 
-override_dh_auto_install:
+override_dh_auto_test-indep:
+
+override_dh_auto_install-arch:
 	$(MAKE) -f makefile.shared LIBTOOL=$(CURDIR)/debian/libtool/libtool install
 
-# Override if not processing -docs
-ifeq (,$(findstring libtommath-doc, $(shell dh_listpackages)))
-override_dh_install:
+override_dh_auto_install-indep:
+
+override_dh_install-arch:
 	dh_install --sourcedir=debian/tmp
-endif
 
 override_dh_clean:
 	dh_clean doc/tommath.out demo/.libs/ demo/demo.lo libtommath.pc debian/libtool/