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

Android: Fix disabling use of cp --reflink=auto, curl, sha224, and sha384.

Browse source 
This was originally done in a7ef05a9, but got lost in some change to the
Makefile. Use CROSS_COMPILE=Android to tell configure that it's configuring
for android instead of passing it a parameter.
This commit is contained in:
Joey Hess 2016-09-05 14:11:35 -04:00
parent 40c0a91641
commit 49b3ef88f7
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Build/Configure.hs
View file

@ -5,7 +5,6 @@
module Build.Configure where module Build.Configure where
import Control.Applicative import Control.Applicative
import System.Environment (getArgs)
import Control.Monad.IfElse import Control.Monad.IfElse
import Control.Monad import Control.Monad
@ -133,12 +132,12 @@ cleanup = removeDirectoryRecursive tmpDir
run :: [TestCase] -> IO () run :: [TestCase] -> IO ()
run ts = do run ts = do
args <- getArgs
setup setup
config <- runTests ts config <- runTests ts
if args == ["Android"] v <- getEnv "CROSS_COMPILE"
then writeSysConfig $ androidConfig config case v of
else writeSysConfig config Just "Android" -> writeSysConfig $ androidConfig config
_ -> writeSysConfig config
cleanup cleanup
whenM isReleaseBuild $ whenM isReleaseBuild $
cabalSetup "git-annex.cabal" cabalSetup "git-annex.cabal"

1
CHANGELOG
View file

@ -5,6 +5,7 @@ git-annex (6.20160809) UNRELEASED; urgency=medium
Thanks, Jim Paris. Thanks, Jim Paris.
* examimekey: Allow being run in a git repo that is not initialized by * examimekey: Allow being run in a git repo that is not initialized by
git-annex yet. git-annex yet.
* Android: Fix disabling use of cp --reflink=auto, curl, sha224, and sha384.
-- Joey Hess <id@joeyh.name> Mon, 05 Sep 2016 11:51:49 -0400 -- Joey Hess <id@joeyh.name> Mon, 05 Sep 2016 11:51:49 -0400

2
Makefile
View file

@ -238,7 +238,7 @@ android: Build/EvilSplicer
# Build just once, but link repeatedly, for different versions of Android. # Build just once, but link repeatedly, for different versions of Android.
mkdir -p tmp/androidtree/dist/build/git-annex/4.0 tmp/androidtree/dist/build/git-annex/4.3 tmp/androidtree/dist/build/git-annex/5.0 mkdir -p tmp/androidtree/dist/build/git-annex/4.0 tmp/androidtree/dist/build/git-annex/4.3 tmp/androidtree/dist/build/git-annex/5.0
if [ ! -e tmp/androidtree/dist/setup-config ]; then \ if [ ! -e tmp/androidtree/dist/setup-config ]; then \
cd tmp/androidtree && $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal configure -fAndroid $(ANDROID_FLAGS); \ cd tmp/androidtree && CROSS_COMPILE=Android $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal configure -fAndroid $(ANDROID_FLAGS); \
fi fi
cd tmp/androidtree && $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal build \ cd tmp/androidtree && $$HOME/.ghc/$(shell cat standalone/android/abiversion)/arm-linux-androideabi/bin/cabal build \
&& mv dist/build/git-annex/git-annex dist/build/git-annex/4.0/git-annex && mv dist/build/git-annex/git-annex dist/build/git-annex/4.0/git-annex