1
0
forked from GitHub/gf-core

remove custom-binary flag; update Cabal version restriction; bump version to 3.10

This commit is contained in:
John J. Camilleri
2018-11-28 13:36:11 +01:00
parent abf3911b70
commit 397f18a298
2 changed files with 19 additions and 35 deletions

View File

@@ -1,5 +1,5 @@
name: gf
version: 3.9-git
version: 3.10
cabal-version: >= 1.22
build-type: Custom
@@ -42,7 +42,7 @@ data-files:
custom-setup
setup-depends:
base,
Cabal >=1.4.0.0,
Cabal >=1.22.0.0,
directory,
filepath,
process >=1.0.1.1
@@ -67,11 +67,6 @@ flag network-uri
-- Description: Make -new-comp the default
-- Default: True
flag custom-binary
Description: Use a customised version of the binary package
Default: True
Manual: True
flag c-runtime
Description: Include functionality from the C run-time library (which must be installed already)
Default: False
@@ -89,17 +84,14 @@ Library
exceptions
hs-source-dirs: src/runtime/haskell
if flag(custom-binary)
other-modules:
-- not really part of GF but I have changed the original binary library
-- and we have to keep the copy for now.
Data.Binary
Data.Binary.Put
Data.Binary.Get
Data.Binary.Builder
Data.Binary.IEEE754
else
build-depends: binary, data-binary-ieee754
other-modules:
-- not really part of GF but I have changed the original binary library
-- and we have to keep the copy for now.
Data.Binary
Data.Binary.Put
Data.Binary.Get
Data.Binary.Builder
Data.Binary.IEEE754
--ghc-options: -fwarn-unused-imports
--if impl(ghc>=7.8)