summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-05-26 13:14:50 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-05-26 13:14:50 -0400
commitead4c8b6f5bf4364d69102e1de3a0e655350f584 (patch)
tree6453d369ecf8914084b49c445b1fb7a88f561c24
parent7fb35645fd9f9d47b27f92c91051b96438f3383e (diff)
remove patch that turns out to be unnecessary
-rw-r--r--standalone/android/haskell-patches/wai-app-static_avoid-building-warp-executable.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/standalone/android/haskell-patches/wai-app-static_avoid-building-warp-executable.patch b/standalone/android/haskell-patches/wai-app-static_avoid-building-warp-executable.patch
deleted file mode 100644
index 7143c30ba..000000000
--- a/standalone/android/haskell-patches/wai-app-static_avoid-building-warp-executable.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 545e4197258d8243ede63314faaa14fa260d450e Mon Sep 17 00:00:00 2001
-From: dummy <dummy@example.com>
-Date: Mon, 26 May 2014 01:33:32 +0000
-Subject: [PATCH] avoid building warp executable
-
-fails to link for some reason
-
-/home/builder/.ghc/android-14/arm-linux-androideabi-4.8/bin/../lib/gcc/arm-linux-androideabi/4.8/../../../../arm-linux-androideabi/bin/ld: fatal error: /home/builder/.ghc/android-14/arm-linux-androideabi-4.8/.cabal/lib/arm-linux-android-ghc-7.8.2/system-filepath-0.4.11/libHSsystem-filepath-0.4.11.a(Path.o): unsupported ELF machine number 0
----
- wai-app-static.cabal | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/wai-app-static.cabal b/wai-app-static.cabal
-index e5d11a6..d4fd0d1 100644
---- a/wai-app-static.cabal
-+++ b/wai-app-static.cabal
-@@ -67,17 +67,6 @@ library
- if flag(print)
- cpp-options: -DPRINT
-
--Executable warp
-- Main-is: warp-static.hs
-- hs-source-dirs: app
-- Build-depends: base >= 4 && < 5
-- , wai-app-static >= 2.0 && < 2.1
-- , directory >= 1.0
-- , containers >= 0.2
-- , bytestring >= 0.9.1.4
-- , text >= 0.7
-- , mime-types >= 0.1 && < 0.2
--
- test-suite runtests
- hs-source-dirs: test
- main-is: ../tests.hs
---
-1.7.10.4
-