[Git][haskell-team/DHG_packages][master] 2 commits: pandoc: Run the build target twice

[Ilias Tsitsimpis (@iliastsi)]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
61c04686 by Ilias Tsitsimpis at 2024-05-01T12:37:03+03:00
pandoc: Run the build target twice

- - - - -
690cb973 by Ilias Tsitsimpis at 2024-05-01T20:27:54+03:00
pandoc: Disable tests on loong64

- - - - -


2 changed files:

- p/haskell-pandoc/debian/changelog
- p/haskell-pandoc/debian/rules


Changes:

=====================================
p/haskell-pandoc/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+haskell-pandoc (3.1.3-2) unstable; urgency=medium
+
+  * Run build target twice, as a workaround for a GHC bug (Closes: #1070015)
+  * Disable tests on loong64 (Closes: #1069165)
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Wed, 01 May 2024 12:36:13 +0300
+
 haskell-pandoc (3.1.3-1) unstable; urgency=medium
 
   * New upstream release (Closes: #1057852)


=====================================
p/haskell-pandoc/debian/rules
=====================================
@@ -1,11 +1,25 @@
 #!/usr/bin/make -f
 
 DEB_ENABLE_TESTS = yes
-DEB_SETUP_BIN_NAME = debian/hlibrary.setup
-DEB_CABAL_PACKAGE = pandoc
-DEB_DEFAULT_COMPILER = ghc
+
+# Disable tests on loong64, see https://bugs.debian.org/1069165
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU), loong64))
+DEB_ENABLE_TESTS = no
+endif
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk
 
 build/haskell-pandoc-data:: build-ghc-stamp
+
+# Override the 'build-ghc-stamp' rule and run 'build_recipe' twice.
+# This is an ugly work-around for https://bugs.debian.org/1070015.
+# This appears to be a GHC bug, and even though build fails the first
+# time on armel, it succeeds with the next try.
+# We should remove this as soon as GHC works correctly.
+build-ghc-stamp: configure-ghc-stamp
+	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
+		-E 'build_recipe' || \
+	perl -d:Confess -MDebian::Debhelper::Buildsystem::Haskell::Recipes=/.*/ \
+		-E 'build_recipe'
+	touch $@



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/6902ac0616b3549c3089b7bbb16e98277b264a56...690cb973c1eff0b27726f297e24619afa91cba30

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/6902ac0616b3549c3089b7bbb16e98277b264a56...690cb973c1eff0b27726f297e24619afa91cba30
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/20240501/b1ddea8f/attachment-0001.htm>