diff --git a/standalone/android/haskell-patches/network_2.4.1.0_0002-remove-Network.BSD-symbols-not-available-in-bionic.patch b/standalone/android/haskell-patches/network_2.4.1.0_0002-remove-Network.BSD-symbols-not-available-in-bionic.patch index 324809ad92..5b07f233b6 100644 --- a/standalone/android/haskell-patches/network_2.4.1.0_0002-remove-Network.BSD-symbols-not-available-in-bionic.patch +++ b/standalone/android/haskell-patches/network_2.4.1.0_0002-remove-Network.BSD-symbols-not-available-in-bionic.patch @@ -1,14 +1,14 @@ -From 8456a3b26261212052bad4d1de207504a3f85995 Mon Sep 17 00:00:00 2001 +From 7861b133bb269b50fcf709291449cb0473818902 Mon Sep 17 00:00:00 2001 From: Joey Hess -Date: Fri, 19 Apr 2013 15:14:10 -0400 +Date: Sun, 29 Dec 2013 21:29:23 +0000 Subject: [PATCH] remove Network.BSD symbols not available in bionic --- - Network/BSD.hsc | 98 --------------------------------------------------------- + Network/BSD.hsc | 98 ------------------------------------------------------- 1 file changed, 98 deletions(-) diff --git a/Network/BSD.hsc b/Network/BSD.hsc -index c199036..f0c9f5b 100644 +index d6dae85..27910f4 100644 --- a/Network/BSD.hsc +++ b/Network/BSD.hsc @@ -30,15 +30,6 @@ module Network.BSD @@ -54,7 +54,7 @@ index c199036..f0c9f5b 100644 #endif ) where -@@ -305,31 +284,6 @@ getProtocolNumber proto = do +@@ -303,31 +282,6 @@ getProtocolNumber proto = do (ProtocolEntry _ _ num) <- getProtocolByName proto return num @@ -86,7 +86,7 @@ index c199036..f0c9f5b 100644 -- --------------------------------------------------------------------------- -- Host lookups -@@ -404,31 +358,6 @@ getHostByAddr family addr = do +@@ -402,31 +356,6 @@ getHostByAddr family addr = do foreign import CALLCONV safe "gethostbyaddr" c_gethostbyaddr :: Ptr HostAddress -> CInt -> CInt -> IO (Ptr HostEntry) @@ -118,8 +118,8 @@ index c199036..f0c9f5b 100644 -- --------------------------------------------------------------------------- -- Accessing network information -@@ -490,33 +419,6 @@ getNetworkByAddr addr family = withLock $ do - foreign import ccall unsafe "getnetbyaddr" +@@ -488,33 +417,6 @@ getNetworkByAddr addr family = withLock $ do + foreign import ccall unsafe "getnetbyaddr" c_getnetbyaddr :: NetworkAddr -> CInt -> IO (Ptr NetworkEntry) -getNetworkEntry :: IO NetworkEntry @@ -153,5 +153,5 @@ index c199036..f0c9f5b 100644 -- Mutex for name service lockdown -- -1.8.2.rc3 +1.7.10.4 diff --git a/standalone/android/haskell-patches/network_2.4.1.0_0005-no-NODELAY-on-android.patch b/standalone/android/haskell-patches/network_2.4.1.0_0005-no-NODELAY-on-android.patch new file mode 100644 index 0000000000..da4a71af21 --- /dev/null +++ b/standalone/android/haskell-patches/network_2.4.1.0_0005-no-NODELAY-on-android.patch @@ -0,0 +1,25 @@ +From bfecbc7bd09cbbebdef12aa525dc17109326db3f Mon Sep 17 00:00:00 2001 +From: Joey Hess +Date: Sun, 29 Dec 2013 21:31:07 +0000 +Subject: [PATCH] no NODELAY on android + +--- + Network/Socket.hsc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Network/Socket.hsc b/Network/Socket.hsc +index 6c21209..c360889 100644 +--- a/Network/Socket.hsc ++++ b/Network/Socket.hsc +@@ -923,7 +923,7 @@ packSocketOption so = + Just MaxSegment -> Just ((#const IPPROTO_TCP), (#const TCP_MAXSEG)) + #endif + #ifdef TCP_NODELAY +- Just NoDelay -> Just ((#const IPPROTO_TCP), (#const TCP_NODELAY)) ++ Just NoDelay -> Nothing -- Just ((#const IPPROTO_TCP), (#const TCP_NODELAY)) + #endif + #ifdef TCP_CORK + Just Cork -> Just ((#const IPPROTO_TCP), (#const TCP_CORK)) +-- +1.7.10.4 +