diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-15 19:11:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-15 19:11:09 -0400 |
| commit | b7afd7a5cb16fc1c38c9090d84c92df1d59c5ae9 (patch) | |
| tree | 01996d7e64743d6a35447d79ebf9e24426dd1ab3 /standalone/android | |
| parent | db60c4d9cd78b769b1c94d1f1b6d6cbf2a66ab03 (diff) | |
add DNS library to Android build environment
Diffstat (limited to 'standalone/android')
| -rw-r--r-- | standalone/android/haskell-patches/iproute_1.2.11_0001-build-without-IPv6-stuff.patch | 47 | ||||
| -rwxr-xr-x | standalone/android/install-haskell-packages | 2 |
2 files changed, 49 insertions, 0 deletions
diff --git a/standalone/android/haskell-patches/iproute_1.2.11_0001-build-without-IPv6-stuff.patch b/standalone/android/haskell-patches/iproute_1.2.11_0001-build-without-IPv6-stuff.patch new file mode 100644 index 000000000..bb9caec77 --- /dev/null +++ b/standalone/android/haskell-patches/iproute_1.2.11_0001-build-without-IPv6-stuff.patch @@ -0,0 +1,47 @@ +From 7beec2e707d59f9573aa2dc7c57bd2a62f16b480 Mon Sep 17 00:00:00 2001 +From: Joey Hess <joey@kitenet.net> +Date: Wed, 15 May 2013 19:06:03 -0400 +Subject: [PATCH] build without IPv6 stuff + +--- + Data/IP.hs | 2 +- + Data/IP/Addr.hs | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Data/IP.hs b/Data/IP.hs +index cffef93..ea486c9 100644 +--- a/Data/IP.hs ++++ b/Data/IP.hs +@@ -6,7 +6,7 @@ module Data.IP ( + -- ** IP data + IP (..) + , IPv4, toIPv4, fromIPv4, fromHostAddress, toHostAddress +- , IPv6, toIPv6, fromIPv6, fromHostAddress6, toHostAddress6 ++ , IPv6, toIPv6, fromIPv6 -- , fromHostAddress6, toHostAddress6 + -- ** IP range data + , IPRange (..) + , AddrRange (addr, mask, mlen) +diff --git a/Data/IP/Addr.hs b/Data/IP/Addr.hs +index faaf0c7..5b556fb 100644 +--- a/Data/IP/Addr.hs ++++ b/Data/IP/Addr.hs +@@ -312,6 +312,7 @@ toHostAddress (IP4 addr4) + | byteOrder == LittleEndian = fixByteOrder addr4 + | otherwise = addr4 + ++{- + -- | The 'fromHostAddress6' function converts 'HostAddress6' to 'IPv6'. + fromHostAddress6 :: HostAddress6 -> IPv6 + fromHostAddress6 = IP6 +@@ -320,6 +321,8 @@ fromHostAddress6 = IP6 + toHostAddress6 :: IPv6 -> HostAddress6 + toHostAddress6 (IP6 addr6) = addr6 + ++-} ++ + fixByteOrder :: Word32 -> Word32 + fixByteOrder s = d1 .|. d2 .|. d3 .|. d4 + where +-- +1.7.10.4 + diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index f9b34acb3..80c7d88c2 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -157,6 +157,8 @@ install_pkgs () { unpatched SHA-1.6.1 onlycross unpatched data-endian-0.0.1 unpatched hinotify-0.3.5 + patched iproute 1.2.11 + unpatched DNS cd .. rm -rf tmp |