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

last changes to fix android build

Browse source
This commit is contained in:
Joey Hess 2015-08-02 23:02:53 -04:00
parent 03e582110e
commit 8b22e1df9c
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -212,7 +212,7 @@ android: Build/EvilSplicer
# and not overwritten.) # and not overwritten.)
cp -uR tmp/splices/* tmp/androidtree || true cp -uR tmp/splices/* tmp/androidtree || true
# Some additional dependencies needed by the expanded splices. # Some additional dependencies needed by the expanded splices.
sed -i 's/^ Build-Depends: */ Build-Depends: yesod-core, shakespeare, blaze-markup, file-embed, wai-app-static, wai, unordered-containers, /' tmp/androidtree/git-annex.cabal sed -i 's/^ Build-Depends: */ Build-Depends: yesod-core, yesod-routes, shakespeare, blaze-markup, file-embed, wai-app-static, wai, unordered-containers, /' tmp/androidtree/git-annex.cabal
# Avoid warnings due to sometimes unused imports added for the splices. # Avoid warnings due to sometimes unused imports added for the splices.
sed -i 's/GHC-Options: \(.*\)-Wall/GHC-Options: \1-Wall -fno-warn-unused-imports /i' tmp/androidtree/git-annex.cabal sed -i 's/GHC-Options: \(.*\)-Wall/GHC-Options: \1-Wall -fno-warn-unused-imports /i' tmp/androidtree/git-annex.cabal
sed -i 's/Extensions: /Extensions: MagicHash /i' tmp/androidtree/git-annex.cabal sed -i 's/Extensions: /Extensions: MagicHash /i' tmp/androidtree/git-annex.cabal

1
standalone/no-th/evilsplicer-headers.hs
View file

@ -24,6 +24,7 @@ import qualified "blaze-markup" Text.Blaze.Internal
import qualified Yesod.Core.Widget import qualified Yesod.Core.Widget
import qualified Yesod.Routes.TH.Types import qualified Yesod.Routes.TH.Types
import qualified Yesod.Core.Dispatch import qualified Yesod.Core.Dispatch
import qualified Yesod.Routes.Dispatch
import qualified WaiAppStatic.Storage.Embedded import qualified WaiAppStatic.Storage.Embedded
import qualified WaiAppStatic.Storage.Embedded.Runtime import qualified WaiAppStatic.Storage.Embedded.Runtime
import qualified Data.FileEmbed import qualified Data.FileEmbed