mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add build dep on network-info

Browse source
This commit is contained in:
Joey Hess 2012-09-07 19:44:20 -04:00
parent 01b908aea8
commit 24bfabe263
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -5,7 +5,7 @@ BASEFLAGS=-threaded -Wall $(IGNORE) -outputdir $(GIT_ANNEX_TMP_BUILD_DIR) -IUtil
# If you get build failures due to missing haskell libraries, # If you get build failures due to missing haskell libraries,
# you can turn off some of these features. # you can turn off some of these features.
FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_OLD_YESOD -DWITH_MULTICAST FEATURES=-DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_OLD_YESOD -DWITH_PAIRING
bins=git-annex bins=git-annex
mans=git-annex.1 git-annex-shell.1 mans=git-annex.1 git-annex-shell.1

1
debian/control vendored
View file

@ -39,6 +39,7 @@ Build-Depends:
libghc-hamlet-dev, libghc-hamlet-dev,
libghc-clientsession-dev, libghc-clientsession-dev,
libghc-network-multicast-dev, libghc-network-multicast-dev,
libghc-network-info-dev,
ikiwiki, ikiwiki,
perlmagick, perlmagick,
git, git,

1
doc/install.mdwn
View file

@ -66,6 +66,7 @@ libraries. To build and use git-annex by hand, you will need:
* [hamlet](http://hackage.haskell.org/package/hamlet) * [hamlet](http://hackage.haskell.org/package/hamlet)
* [clientsession](http://hackage.haskell.org/package/clientsession) * [clientsession](http://hackage.haskell.org/package/clientsession)
* [network-multicast](http://hackage.haskell.org/package/network-multicast) * [network-multicast](http://hackage.haskell.org/package/network-multicast)
* [network-info](http://hackage.haskell.org/package/network-info)
* Shell commands * Shell commands
* [git](http://git-scm.com/) * [git](http://git-scm.com/)
* [uuid](http://www.ossp.org/pkg/lib/uuid/) * [uuid](http://www.ossp.org/pkg/lib/uuid/)

10
git-annex.cabal
View file

@ -40,8 +40,8 @@ Flag Assistant
Flag Webapp Flag Webapp
Description: Enable git-annex webapp Description: Enable git-annex webapp
Flag Multicast Flag Pairing
Description: Enable multicast pairing Description: Enable pairing
Executable git-annex Executable git-annex
Main-Is: git-annex.hs Main-Is: git-annex.hs
@ -85,9 +85,9 @@ Executable git-annex
template-haskell, yesod-default (>= 1.1.0), data-default template-haskell, yesod-default (>= 1.1.0), data-default
CPP-Options: -DWITH_WEBAPP CPP-Options: -DWITH_WEBAPP
if flag(Multicast) && flag(Webapp) if flag(Pairing) && flag(Webapp)
Build-Depends: network-multicast Build-Depends: network-multicast, network-info
CPP-Options: -DWITH_MULTICAST CPP-Options: -DWITH_PAIRING
if os(darwin) if os(darwin)
CPP-Options: -DOSX CPP-Options: -DOSX