From 4fd1ec71c996d527829936969b770a835387a391 Mon Sep 17 00:00:00 2001 From: Thomas Hallgren Date: Tue, 31 Jul 2018 14:29:18 +0200 Subject: [PATCH] gf-server.cabal: relax network version bounds and make building the library and pgf-service executable optional This allows you to build the content-service without installing the problematic fastcgi library. --- src/server/gf-server.cabal | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/server/gf-server.cabal b/src/server/gf-server.cabal index 6e3004fb5..211f11683 100644 --- a/src/server/gf-server.cabal +++ b/src/server/gf-server.cabal @@ -16,17 +16,28 @@ flag http Description: Build pgf-http (deprecated, replaced by gf -server) Default: False +flag fastcgi + Description: Build librar & pgf-service executable with fastcgi support + Default: True + flag c-runtime Description: Include functionality from the C run-time library (which must be installed already) Default: False +flag network-uri + description: Get Network.URI from the network-uri package + default: True + Library exposed-modules: PGFService FastCGIUtils CGIUtils ServeStaticFile RunHTTP Cache other-modules: URLEncoding CGI Fold hs-source-dirs: . transfer - build-depends: fastcgi >= 3001.0.2.2 + if flag(fastcgi) + build-depends: fastcgi >= 3001.0.2.2 -- Install it in Ubuntu with: apt-get install libghc-fastcgi-dev + else + Buildable: False build-depends: base >=4.2 && <5, time, time-compat, old-locale, @@ -39,13 +50,17 @@ Library httpd-shed>=0.4.0.2, mtl, exceptions, - network>=2.3 && <2.6, json >= 0.3.3, utf8-string >= 0.3.1.1, bytestring, pretty, random + if flag(network-uri) + build-depends: network-uri>=2.6, network>=2.6 + else + build-depends: network>=2.3 && <2.6 + ghc-options: -fwarn-unused-imports if os(windows) ghc-options: -optl-mwindows @@ -75,8 +90,11 @@ executable pgf-service if impl(ghc>=7.0) ghc-options: -rtsopts - build-depends: fastcgi >= 3001.0.2.2 + if flag(fastcgi) + build-depends: fastcgi >= 3001.0.2.2 -- Install it in Ubuntu with: apt-get install libghc-fastcgi-dev + else + Buildable: False build-depends: base >=4.2 && <5, gf-server