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

android build fix

Browse source
This commit is contained in:
Joey Hess 2013-04-15 19:14:18 -04:00
parent 34472ecbe5
commit b5e97c50f4
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -163,9 +163,9 @@ osxapp: Build/Standalone Build/OSXMkLibs
android: Build/EvilSplicer android: Build/EvilSplicer
echo "Running native build, to get TH splices.." echo "Running native build, to get TH splices.."
if [ ! -e dist/setup/setup ]; then $(CABAL) configure -f"-Production" -O0; fi if [ ! -e dist/setup/setup ]; then $(CABAL) configure -f"-Production" -O0; fi
mkdir -p tmp
$(CABAL) build --ghc-options=-ddump-splices 2> tmp/dump-splices $(CABAL) build --ghc-options=-ddump-splices 2> tmp/dump-splices
echo "Setting up Android build tree.." echo "Setting up Android build tree.."
mkdir -p tmp
./Build/EvilSplicer tmp/splices tmp/dump-splices standalone/android/evilsplicer-headers.hs ./Build/EvilSplicer tmp/splices tmp/dump-splices standalone/android/evilsplicer-headers.hs
rsync -az --exclude tmp --exclude dist . tmp/androidtree rsync -az --exclude tmp --exclude dist . tmp/androidtree
# Copy the files with expanded splices to the source tree, but # Copy the files with expanded splices to the source tree, but
@ -178,7 +178,11 @@ android: Build/EvilSplicer
sed -i 's/^ Build-Depends: / Build-Depends: yesod-core, shakespeare-js, shakespeare, blaze-markup, /' tmp/androidtree/git-annex.cabal sed -i 's/^ Build-Depends: / Build-Depends: yesod-core, shakespeare-js, shakespeare, blaze-markup, /' tmp/androidtree/git-annex.cabal
# cabal cannot cross compile with custom build type, so workaround # cabal cannot cross compile with custom build type, so workaround
sed -i 's/Build-type: Custom/Build-type: Simple/' tmp/androidtree/git-annex.cabal sed -i 's/Build-type: Custom/Build-type: Simple/' tmp/androidtree/git-annex.cabal
if [ ! -e tmp/androidtree/dist/setup-config ]; then cd tmp/androidtree && $$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin/cabal configure -f'Android Assistant -Pairing'; fi if [ ! -e tmp/androidtree/dist/setup/setup ]; then \
cd tmp/androidtree; \
cabal configure \
$$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin/cabal configure -f'Android Assistant -Pairing'; \
fi
$(MAKE) -C tmp/androidtree git-annex $(MAKE) -C tmp/androidtree git-annex
androidapp: androidapp: