git.iko.soy/jsaddle
on master help sign in
Replace ghcjs flag with impl(ghcjs)
7d23924Hamish Mackenzie
jsaddle.cabal+6−18
compare with master
unifiedsplit
@@ -17,10 +17,6 @@ Source-Repository head
17 type: git
17 type: git
18 location: https://github.com/ghcjs/jsaddle
18 location: https://github.com/ghcjs/jsaddle
19
19
20−flag ghcjs
21− description: Tell cabal we are using ghcjs (work around until hackage supports impl(ghcjs))
22− default: True
23−
24flag gtk3
20flag gtk3
25 Description: Use GTK3 rather than GTK2
21 Description: Use GTK3 rather than GTK2
26 Default: True
22 Default: True
@@ -34,23 +30,17 @@ flag webkit
34 default: False
30 default: False
35
31
36library
32library
37− -- Make sure ghcjs gets turned off if ghcjs-base is not avaialbe
38− if flag(ghcjs)
39− build-depends: ghcjs-base
40−
41−-- if impl(ghcjs) && flag(jsffi)
33+ if impl(ghcjs) && flag(jsffi)
42− if flag(ghcjs) && flag(jsffi)
43 cpp-options: -DUSE_JAVASCRIPTFFI
34 cpp-options: -DUSE_JAVASCRIPTFFI
44 build-depends: ghcjs-base
35 build-depends: ghcjs-base
45
36
46−-- if !impl(ghcjs) || flag(webkit)
37+ if !impl(ghcjs) || flag(webkit)
47− if !flag(ghcjs) || flag(webkit)
48 cpp-options: -DUSE_WEBKIT
38 cpp-options: -DUSE_WEBKIT
49 if flag(gtk3)
39 if flag(gtk3)
50− build-depends: webkitgtk3 >=0.13.0.0 && <0.14,
40+ build-depends: webkitgtk3 >=0.13.0.0 && <0.15,
51 webkitgtk3-javascriptcore >=0.13.0.0 && <0.14
41 webkitgtk3-javascriptcore >=0.13.0.0 && <0.14
52 else
42 else
53− build-depends: webkit >=0.13.0.0 && <0.14,
43+ build-depends: webkit >=0.13.0.0 && <0.15,
54 webkit-javascriptcore >=0.13.0.0 && <0.14
44 webkit-javascriptcore >=0.13.0.0 && <0.14
55
45
56 build-depends: template-haskell -any, base <5, lens >=3.8.5 && <4.13,
46 build-depends: template-haskell -any, base <5, lens >=3.8.5 && <4.13,
@@ -73,13 +63,11 @@ test-suite test-tool
73 if flag(jsffi)
63 if flag(jsffi)
74 buildable: False
64 buildable: False
75
65
76−-- if impl(ghcjs) && flag(jsffi)
66+ if impl(ghcjs) && flag(jsffi)
77− if flag(ghcjs) && flag(jsffi)
78 cpp-options: -DUSE_JAVASCRIPTFFI
67 cpp-options: -DUSE_JAVASCRIPTFFI
79 build-depends: ghcjs-base
68 build-depends: ghcjs-base
80
69
81−-- if !impl(ghcjs) || flag(webkit)
70+ if !impl(ghcjs) || flag(webkit)
82− if !flag(ghcjs) || flag(webkit)
83 cpp-options: -DUSE_WEBKIT
71 cpp-options: -DUSE_WEBKIT
84 build-depends: glib
72 build-depends: glib
85 if flag(gtk3)
73 if flag(gtk3)