diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-10 15:48:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-10 15:48:38 -0400 |
| commit | 4e14ef3660924e7c005c42d4d58716ee0beb2d31 (patch) | |
| tree | 4691e44203ded56f77bf2c4abf5de9a6acdac462 /Assistant | |
| parent | 516d4899d3ea7e12ee9b408160b36190b8c2d3f2 (diff) | |
can now build Android targeted binary
Various things that don't work on Android are just ifdefed out.
* the webapp (needs template haskell for arm)
* --include and --exclude globbing (needs libpcre, which is not ported;
probably I'll make it use the pure haskell glob library instead)
* annex.diskreserve checking (missing sys/statvfs.h)
* timestamp preservation support (yawn)
* S3
* WebDAV
* XMPP
The resulting 17mb binary has been tested on Android, and it is able to,
at least, print its usage message.
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Pairing.hs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Assistant/Pairing.hs b/Assistant/Pairing.hs index 6df54873a..2c1fcf0d0 100644 --- a/Assistant/Pairing.hs +++ b/Assistant/Pairing.hs @@ -5,6 +5,8 @@ - Licensed under the GNU GPL version 3 or higher. -} +{-# LANGUAGE CPP #-} + module Assistant.Pairing where import Common.Annex @@ -70,7 +72,12 @@ data PairingInProgress = PairingInProgress } deriving (Show) -data SomeAddr = IPv4Addr HostAddress | IPv6Addr HostAddress6 +data SomeAddr = IPv4Addr HostAddress +{- My Android build of the Network library does not currently have IPV6 + - support. -} +#ifndef WITH_ANDROID + | IPv6Addr HostAddress6 +#endif deriving (Ord, Eq, Read, Show) {- This contains the whole secret, just lightly obfuscated to make it not |