[Git][haskell-team/DHG_packages][master] Assume GHCi is always available
Ilias Tsitsimpis (@iliastsi)
gitlab at salsa.debian.org
Thu Oct 10 13:11:09 BST 2024
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
44222b36 by Ilias Tsitsimpis at 2024-10-10T15:09:19+03:00
Assume GHCi is always available
Compiling without template-haskell support leads to broken packages
(e.g., haskell-reflection) since it's an experimental feature most of
the time. Besides, we already validate that we support GHCi on all
platforms, so there is no need to test for this again.
- - - - -
13 changed files:
- p/gitit/debian/rules
- p/haskell-equivalence/debian/rules
- p/haskell-happstack-server/debian/rules
- p/haskell-monad-logger/debian/rules
- p/haskell-optparse-applicative/debian/rules
- p/haskell-path-pieces/debian/rules
- p/haskell-quickcheck/debian/rules
- p/haskell-reflection/debian/changelog
- p/haskell-reflection/debian/rules
- p/haskell-sandi/debian/rules
- p/haskell-web-routes/debian/rules
- p/haskell-xml-conduit/debian/rules
- p/haskell-yaml/debian/rules
Changes:
=====================================
p/gitit/debian/rules
=====================================
@@ -9,10 +9,6 @@ MANPAGES := gitit.1 expireGititCache.1
DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/docbook-xsl/manpages/docbook.xsl
XP = xsltproc -''-nonet -''-param man.charmap.use.subset "0"
-ifeq (0,$(shell ghc --info | grep 'Have interpreter.*NO' >/dev/null 2>&1; echo $$?))
-DEB_SETUP_GHC_CONFIGURE_ARGS := --flags=-plugins
-endif
-
%.1: debian/%.xml
$(XP) $(DB2MAN) $<
=====================================
p/haskell-equivalence/debian/rules
=====================================
@@ -1,12 +1,6 @@
#!/usr/bin/make -f
-# The test suite requires template haskell
-ifeq (0,$(shell ghc --info | grep 'Have interpreter.*YES' >/dev/null 2>&1; echo $$?))
DEB_ENABLE_TESTS = yes
-else
-DEB_ENABLE_TESTS = no
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-happstack-server/debian/rules
=====================================
@@ -1,12 +1,6 @@
#!/usr/bin/make -f
-ifeq (0,$(shell ghc --info | grep -q 'Have interpreter.*YES'; echo $$?))
-DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=template_haskell
-else
-DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=-template_haskell
-endif
DEB_ENABLE_TESTS = yes
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-monad-logger/debian/rules
=====================================
@@ -1,11 +1,5 @@
#!/usr/bin/make -f
-ifeq (0,$(shell ghc --info | grep -q 'Have interpreter.*YES'; echo $$?))
-DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=template_haskell
-else
-DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=-template_haskell
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-optparse-applicative/debian/rules
=====================================
@@ -1,8 +1,6 @@
#!/usr/bin/make -f
-ifeq (0,$(shell ghc --info | grep 'Have interpreter.*YES' >/dev/null 2>&1; echo $$?))
DEB_ENABLE_TESTS = yes
-endif
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-path-pieces/debian/rules
=====================================
@@ -1,12 +1,6 @@
#!/usr/bin/make -f
-# The test suite requires template haskell
-ifeq (0,$(shell ghc --info | grep 'Have interpreter.*YES' >/dev/null 2>&1; echo $$?))
DEB_ENABLE_TESTS = yes
-else
-DEB_ENABLE_TESTS = no
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-quickcheck/debian/rules
=====================================
@@ -4,8 +4,5 @@ DEB_ENABLE_TESTS = yes
DEB_CABAL_PACKAGE = quickcheck2
-# Disable templateHaskell on architecture that doesn't support it
-DEB_SETUP_GHC_CONFIGURE_ARGS := $(shell ghc --info | fgrep 'Have interpreter' | fgrep -q YES || printf %s --flags=-templateHaskell )
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-reflection/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-reflection (2.1.8-2) unstable; urgency=medium
+
+ * Compile using template-haskell
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Thu, 10 Oct 2024 15:06:38 +0300
+
haskell-reflection (2.1.8-1) unstable; urgency=medium
* Declare compliance with Debian policy 4.7.0
=====================================
p/haskell-reflection/debian/rules
=====================================
@@ -1,10 +1,4 @@
#!/usr/bin/make -f
-ifeq (0,$(shell ghc --info | grep -q 'Have interpreter.*YES'; echo $$?))
-DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=template-haskell
-else
-DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=-template-haskell
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-sandi/debian/rules
=====================================
@@ -1,12 +1,6 @@
#!/usr/bin/make -f
-# The test suite requires template haskell
-ifeq (0,$(shell ghc --info | grep 'Have interpreter.*YES' >/dev/null 2>&1; echo $$?))
DEB_ENABLE_TESTS = yes
-else
-DEB_ENABLE_TESTS = no
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-web-routes/debian/rules
=====================================
@@ -2,15 +2,11 @@
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifeq (0,$(shell ghc --info | grep 'Have interpreter.*YES' >/dev/null 2>&1; echo $$?))
ifeq (,$(filter $(DEB_BUILD_ARCH),mips mipsel mips64el))
DEB_ENABLE_TESTS = yes
else
DEB_ENABLE_TESTS = no
endif
-else
- DEB_ENABLE_TESTS = no
-endif
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-xml-conduit/debian/rules
=====================================
@@ -1,11 +1,6 @@
#!/usr/bin/make -f
DEB_ENABLE_TESTS = yes
-ifeq (0,$(shell ghc --info | grep -q 'Have interpreter.*YES'; echo $$?))
-ifeq (s390x,$(DEB_HOST_ARCH))
- DEB_ENABLE_TESTS = no
-endif
-endif
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
=====================================
p/haskell-yaml/debian/rules
=====================================
@@ -3,17 +3,11 @@
# See https://bugs.debian.org/951490
DEB_SETUP_GHC_CONFIGURE_ARGS := --flags="no-exe"
-# The test suite requires template haskell
-ifeq (0,$(shell ghc --info | grep 'Have interpreter.*YES' >/dev/null 2>&1; echo $$?))
ifeq (,$(filter $(DEB_BUILD_ARCH),mips mipsel mips64el))
DEB_ENABLE_TESTS = yes
export LC_ALL=C.UTF-8
else
DEB_ENABLE_TESTS = no
-endif
-else
-DEB_ENABLE_TESTS = no
-endif
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/44222b36b7936cbe4bd71753f88aef2468fe966a
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/44222b36b7936cbe4bd71753f88aef2468fe966a
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/20241010/e5e81e65/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list