diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-01-26 08:14:57 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-01-26 08:14:57 -0400 |
commit | 1d48e19b5a47df04abcce777e6543dabb17f2ce5 (patch) | |
tree | b0309fcfb109009a47ebbd11c0ef5cdd7f0d1452 /git-annex.cabal | |
parent | 86648b502149d32ee0f9af200e949e8240208a8c (diff) |
remove 3 build flags
* Removed the webapp-secure build flag, rolling it into the webapp build
flag.
* Removed the quvi and tahoe build flags, which only adds aeson to
the core dependencies.
* Removed the feed build flag, which only adds feed to the core
dependencies.
Build flags have cost in both code complexity and also make Setup configure
have to work harder to find a usable set of build flags when some
dependencies are missing.
Diffstat (limited to 'git-annex.cabal')
-rw-r--r-- | git-annex.cabal | 48 |
1 files changed, 12 insertions, 36 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index b5b588974..1b2f82b74 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -43,9 +43,6 @@ Flag Assistant Flag Webapp Description: Enable git-annex webapp -Flag Webapp-secure - Description: Secure webapp - Flag Pairing Description: Enable pairing @@ -69,15 +66,6 @@ Flag TestSuite Flag TDFA Description: Use regex-tdfa for wildcards -Flag Feed - Description: Enable podcast feed support - -Flag Quvi - Description: Enable use of quvi to download videos - -Flag Tahoe - Description: Enable the tahoe special remote - Flag TorrentParser Description: Use haskell torrent library to parse torrent files @@ -117,13 +105,19 @@ Executable git-annex bloomfilter, edit-distance, resourcet, http-conduit, http-client, http-types, time, old-locale, - esqueleto, persistent-sqlite, persistent, persistent-template + esqueleto, persistent-sqlite, persistent, persistent-template, + aeson, + feed CC-Options: -Wall GHC-Options: -Wall -fno-warn-tabs Extensions: PackageImports -- Some things don't work with the non-threaded RTS. GHC-Options: -threaded + -- Fully optimize for production. + if flag(Production) + GHC-Options: -O2 + -- Avoid linking with unused dynamic libaries. -- (Only tested on Linux). if os(Linux) @@ -140,10 +134,6 @@ Executable git-annex else Build-Depends: cryptohash (>= 0.11.0) - -- Fully optimize for production. - if flag(Production) - GHC-Options: -O2 - if (os(windows)) Build-Depends: Win32, Win32-extras, unix-compat (>= 0.4.1.3), setenv, process (>= 1.3.0.0) @@ -217,17 +207,15 @@ Executable git-annex yesod-core (>= 1.2.19), path-pieces (>= 0.1.4), warp (>= 3.0.0.5), - warp-tls, + warp-tls (>= 1.4), wai, wai-extra, blaze-builder, crypto-api, clientsession, - template-haskell, aeson, - shakespeare (>= 2.0.0) + template-haskell, + shakespeare (>= 2.0.0), + securemem, + byteable CPP-Options: -DWITH_WEBAPP - if flag(Webapp) && flag (Webapp-secure) - Build-Depends: warp-tls (>= 1.4), securemem, byteable - CPP-Options: -DWITH_WEBAPP_SECURE - if flag(Pairing) Build-Depends: network-multicast, network-info CPP-Options: -DWITH_PAIRING @@ -239,19 +227,7 @@ Executable git-annex if flag(DNS) Build-Depends: dns CPP-Options: -DWITH_DNS - - if flag(Feed) - Build-Depends: feed (>= 0.3.4) - CPP-Options: -DWITH_FEED - if flag(Quvi) - Build-Depends: aeson - CPP-Options: -DWITH_QUVI - - if flag(Tahoe) - Build-Depends: aeson - CPP-Options: -DWITH_TAHOE - if flag(TorrentParser) Build-Depends: torrent (>= 10000.0.0) CPP-Options: -DWITH_TORRENTPARSER |