Skip to content

Commit 7c75962

Browse files
committed
rebaseme, loosen text constraint
1 parent 435de69 commit 7c75962

File tree

1 file changed

+34
-8
lines changed

1 file changed

+34
-8
lines changed

foundationdb-haskell.cabal

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,42 +75,56 @@ flag with-generate-options
7575
flag fdb-version-520
7676
description: Indicates that we are building against version 5.2.x of fdb_c.h
7777
Only one of these flags may be specified. If none are specified,
78-
7.1.x is assumed.
78+
7.3.x is assumed.
7979
Manual: True
8080
Default: False
8181

8282
flag fdb-version-600
8383
description: Indicates that we are building against version 6.0.x of fdb_c.h
8484
Only one of these flags may be specified. If none are specified,
85-
7.1.x is assumed.
85+
7.3.x is assumed.
8686
Manual: True
8787
Default: False
8888

8989
flag fdb-version-610
9090
description: Indicates that we are building against version 6.1.x of fdb_c.h
9191
Only one of these flags may be specified. If none are specified,
92-
7.1.x is assumed.
92+
7.3.x is assumed.
9393
Manual: True
9494
Default: False
9595

9696
flag fdb-version-620
9797
description: Indicates that we are building against version 6.2.x of fdb_c.h
9898
Only one of these flags may be specified. If none are specified,
99-
7.1.x is assumed.
99+
7.3.x is assumed.
100100
Manual: True
101101
Default: False
102102

103103
flag fdb-version-630
104104
description: Indicates that we are building against version 6.3.x of fdb_c.h
105105
Only one of these flags may be specified. If none are specified,
106-
7.1.x is assumed.
106+
7.3.x is assumed.
107107
Manual: True
108108
Default: False
109109

110110
flag fdb-version-700
111-
description: Indicates that we are building against version 6.3.x of fdb_c.h
111+
description: Indicates that we are building against version 7.0.x of fdb_c.h
112+
Only one of these flags may be specified. If none are specified,
113+
7.3.x is assumed.
114+
Manual: True
115+
Default: False
116+
117+
flag fdb-version-710
118+
description: Indicates that we are building against version 7.1.x of fdb_c.h
112119
Only one of these flags may be specified. If none are specified,
113-
7.1.x is assumed.
120+
7.3.x is assumed.
121+
Manual: True
122+
Default: False
123+
124+
flag fdb-version-720
125+
description: Indicates that we are building against version 7.2.x of fdb_c.h
126+
Only one of these flags may be specified. If none are specified,
127+
7.3.x is assumed.
114128
Manual: True
115129
Default: False
116130

@@ -156,7 +170,7 @@ library
156170
, integer-gmp >= 0.5.1.0 && < 1.2
157171
, mtl >= 2.2.0 && < 2.3
158172
, random >= 1.1 && < 1.3
159-
, text >= 1.2.3.0 && < 1.3
173+
, text >= 1.2.3.0 && < 2.1
160174
, deepseq >= 1.4.0.0 && < 1.5
161175
, monad-control >= 1.0.0.0 && < 1.1
162176
, transformers-base >= 0.4.0 && < 0.5
@@ -204,6 +218,12 @@ library
204218
if flag(fdb-version-700)
205219
CC-Options: -std=c99 -DFDB_API_VERSION=700
206220
CPP-Options: -DFDB_API_VERSION=700
221+
if flag(fdb-version-710)
222+
CC-Options: -std=c99 -DFDB_API_VERSION=710
223+
CPP-Options: -DFDB_API_VERSION=710
224+
if flag(fdb-version-720)
225+
CC-Options: -std=c99 -DFDB_API_VERSION=720
226+
CPP-Options: -DFDB_API_VERSION=720
207227

208228
executable generate-options
209229
if flag(with-generate-options)
@@ -264,6 +284,12 @@ test-suite tests
264284
if flag(fdb-version-700)
265285
CC-Options: -std=c99 -DFDB_API_VERSION=700
266286
CPP-Options: -DFDB_API_VERSION=700
287+
if flag(fdb-version-710)
288+
CC-Options: -std=c99 -DFDB_API_VERSION=710
289+
CPP-Options: -DFDB_API_VERSION=710
290+
if flag(fdb-version-720)
291+
CC-Options: -std=c99 -DFDB_API_VERSION=720
292+
CPP-Options: -DFDB_API_VERSION=720
267293

268294
benchmark tuple-bench
269295
type: exitcode-stdio-1.0

0 commit comments

Comments
 (0)