* [gentoo-commits] repo/gentoo:master commit in: dev-haskell/foldl/files/
@ 2023-11-20 15:10 Sam James
0 siblings, 0 replies; only message in thread
From: Sam James @ 2023-11-20 15:10 UTC (permalink / raw
To: gentoo-commits
commit: c420baf69d53267c8cf38f8b8df94ec6bf8a68ea
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Mon Nov 13 17:42:45 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 20 15:09:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c420baf6
dev-haskell/foldl: fix building without USE=test
The recent cabal-doctest patch broke building without USE=test since
MIN_VERSION_cabal_doctest will be undefined. Fix this by defining it at
the top of Setup.hs if it's undefined
Closes: https://bugs.gentoo.org/917624
Signed-off-by: hololeap <hololeap <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33919
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-haskell/foldl/files/foldl-1.4.15-cabal-doctest.patch | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dev-haskell/foldl/files/foldl-1.4.15-cabal-doctest.patch b/dev-haskell/foldl/files/foldl-1.4.15-cabal-doctest.patch
index 6c554607eff5..a5fad758b449 100644
--- a/dev-haskell/foldl/files/foldl-1.4.15-cabal-doctest.patch
+++ b/dev-haskell/foldl/files/foldl-1.4.15-cabal-doctest.patch
@@ -18,11 +18,15 @@ diff --git a/Setup.hs b/Setup.hs
index 9a994af..f21ad76 100644
--- a/Setup.hs
+++ b/Setup.hs
-@@ -1,2 +1,19 @@
+@@ -1,2 +1,23 @@
+{-# LANGUAGE CPP #-}
+
+module Main (main) where
+
++#ifndef MIN_VERSION_cabal_doctest
++#define MIN_VERSION_cabal_doctest(x,y,z) 0
++#endif
++
+#if MIN_VERSION_cabal_doctest(1,0,0)
+
+import Distribution.Extra.Doctest ( defaultMainWithDoctests )
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2023-11-20 15:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-20 15:10 [gentoo-commits] repo/gentoo:master commit in: dev-haskell/foldl/files/ Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox