Relax dependencies and bump.

Set NO_REGRESS until --enable-tests will be set by default.
This commit is contained in:
kili 2012-12-02 20:46:08 +00:00
parent b0493ec32a
commit 9ceb748da0
2 changed files with 38 additions and 3 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2012/10/28 23:27:05 kili Exp $
# $OpenBSD: Makefile,v 1.4 2012/12/02 20:46:08 kili Exp $
COMMENT = extra concurrency primitives
DISTNAME = concurrent-extra-0.7.0.4
REVISION = 1
REVISION = 2
CATEGORIES = devel
# BSD3
@ -17,7 +17,11 @@ MODGHC_BUILD = cabal hackage haddock register
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = devel/hs-base-unicode-symbols>=0.1.1,<0.3 \
devel/hs-stm>=2.1.2.1,<2.4 \
devel/hs-stm>=2.1.2.1,<2.5 \
devel/hs-unbounded-delays
# Needs --enable-test, which will probably set by ghc.port.mk soon
# (when I have some numbers about build times).
NO_REGRESS = Yes
.include <bsd.port.mk>

View File

@ -0,0 +1,31 @@
$OpenBSD: patch-concurrent-extra_cabal,v 1.1 2012/12/02 20:46:08 kili Exp $
Builds fine with stm-2.4.
The testsuite passes fine with it (and test-framework-0.6).
Note: To be able to run the testsuite, you have to build with
MODGHC_SETUP_CONF_ARGS = --enable-tests
--- concurrent-extra.cabal.orig Sun Apr 8 15:33:58 2012
+++ concurrent-extra.cabal Fri Nov 30 22:30:29 2012
@@ -52,7 +52,7 @@ source-repository head
library
build-depends: base >= 3 && < 4.6
, base-unicode-symbols >= 0.1.1 && < 0.3
- , stm >= 2.1.2.1 && < 2.4
+ , stm >= 2.1.2.1 && < 2.5
, unbounded-delays >= 0.1 && < 0.2
exposed-modules: Control.Concurrent.Lock
, Control.Concurrent.STM.Lock
@@ -82,10 +82,10 @@ test-suite test-concurrent-extra
build-depends: base >= 3 && < 4.6
, base-unicode-symbols >= 0.1.1 && < 0.3
- , stm >= 2.1.2.1 && < 2.4
+ , stm >= 2.1.2.1 && < 2.5
, unbounded-delays >= 0.1 && < 0.2
, HUnit >= 1.2.2 && < 1.3
- , test-framework >= 0.2.4 && < 0.5
+ , test-framework >= 0.2.4 && < 0.7
, test-framework-hunit >= 0.2.4 && < 0.3
-------------------------------------------------------------------------------