[Git][haskell-team/haskell-devscripts][master] Re-add separate configure/check/haddock targets

[Ilias Tsitsimpis (@iliastsi)]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / haskell-devscripts


Commits:
8c9d087b by Ilias Tsitsimpis at 2022-07-20T17:58:49+03:00
Re-add separate configure/check/haddock targets

This should fix #1011762, bug#1011767, #1011764, #1011834, #1011873,

- - - - -


2 changed files:

- debian/changelog
- hlibrary.mk


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-devscripts (0.16.23) unstable; urgency=medium
+
+  * Re-add separate configure/check/haddock targets
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Wed, 20 Jul 2022 17:58:43 +0300
+
 haskell-devscripts (0.16.22) unstable; urgency=medium
 
   * Fix bug where ${CABAL_PACKAGE}.cabal may not exist.


=====================================
hlibrary.mk
=====================================
@@ -138,7 +138,9 @@ export GHC_HAS_SMP
 clean::
 	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
 		-E 'clean_recipe'
-	rm -f build-ghc-stamp build-hugs-stamp
+	rm -f configure-ghc-stamp
+	rm -f build-ghc-stamp build-hugs-stamp build-haddock-stamp
+	rm -f check-ghc-stamp
 	rm -f debian/tmp
 	rm -rf debian/tmp-inst-ghc debian/tmp-inst-ghcjs
 	rm -rf $(DEB_GHC_DATABASE)
@@ -149,14 +151,34 @@ $(DEB_SETUP_BIN_NAME):
 	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
 		-E 'make_setup_recipe'
 
-build-ghc-stamp: $(DEB_SETUP_BIN_NAME)
+configure-ghc-stamp: $(DEB_SETUP_BIN_NAME)
 	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
-		-E 'configure_recipe; haddock_recipe; build_recipe; check_recipe'
+		-E 'configure_recipe'
 	touch $@
 
-build/%-dev build/%-prof build/%-doc:: build-ghc-stamp
+build-ghc-stamp: configure-ghc-stamp
+	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
+		-E 'build_recipe'
+	touch $@
+
+check-ghc-stamp: build-ghc-stamp
+	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
+		-E 'check_recipe'
+	touch $@
+
+build/%-dev build/%-prof:: build-ghc-stamp check-ghc-stamp
+
+build-haddock-stamp: configure-ghc-stamp
+	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
+		-E 'haddock_recipe'
+	touch $@
+
+build/%-doc:: build-haddock-stamp
 
-debian/tmp-inst-%: $(DEB_SETUP_BIN_NAME) build-ghc-stamp
+# FIXME: For now, we have a single install recipe, which means we have
+# to build both arch and indep (haddock) artifacts, even if we need only
+# one of them. We should split the install recipe into two.
+debian/tmp-inst-%: $(DEB_SETUP_BIN_NAME) build-ghc-stamp build-haddock-stamp
 	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
 		-E 'install_recipe($$ARGV[0])' "$@"
 	ln --symbolic --force "$@" debian/tmp



View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/commit/8c9d087bc63ddcf19823c3f7e52c6b58093c9a31

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/commit/8c9d087bc63ddcf19823c3f7e52c6b58093c9a31
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20220720/f185fd79/attachment-0001.htm>