disable new build flags for android build

3 files changed, 21 insertions, 1 deletions

diff --git a/doc/todo/standalone__47__android__47__buildchroot-inchroot_should_install_libmagic-dev.mdwn b/doc/todo/standalone__47__android__47__buildchroot-inchroot_should_install_libmagic-dev.mdwn
index 2139c3090..0b0faea90 100644
--- a/doc/todo/standalone__47__android__47__buildchroot-inchroot_should_install_libmagic-dev.mdwn
+++ b/doc/todo/standalone__47__android__47__buildchroot-inchroot_should_install_libmagic-dev.mdwn
@@ -1 +1,3 @@
 I'm setting up an Android build environment, and the standalone/android/install-haskell-packages script fails while installing the Magic package. The standalone/android/buildchroot-inchroot package should run `apt-get -y install libmagic-dev` to install this dependency.
+
+> [[done]] --[[Joey]]
diff --git a/doc/todo/standalone__47__android__47__buildchroot-inchroot_should_install_libmagic-dev/comment_2_b56653f1c57acf70eb2ed3abb4546844._comment b/doc/todo/standalone__47__android__47__buildchroot-inchroot_should_install_libmagic-dev/comment_2_b56653f1c57acf70eb2ed3abb4546844._comment
new file mode 100644
index 000000000..4c626bba9
--- /dev/null
+++ b/doc/todo/standalone__47__android__47__buildchroot-inchroot_should_install_libmagic-dev/comment_2_b56653f1c57acf70eb2ed3abb4546844._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 3"""
+ date="2016-02-23T14:55:36Z"
+ content="""
+My android builds include neither magic nor concurrent-output (which is
+what's using terminal-size). I don't feel it's worth trying to get
+these features working on androd.
+
+So, I've adjusted install-haskell-packages to disable the flags.
+
+If you are interested in working on the android port, I'd be very excited
+for any help. As you can see, there is much room for improvement in the
+build system for it. (It would be nice to rework it to use stack, rather
+than the current approach, and using stack would automatically disable
+these flags that are not portable.) And of course, there are many other
+parts of the android port that need improvement.
+"""]]
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages
index f338cc6c7..ea5f160d2 100755
--- a/standalone/android/install-haskell-packages
+++ b/standalone/android/install-haskell-packages
@@ -65,7 +65,7 @@ patched () {
 installgitannexdeps () {
 	pushd ../..
 	ln -sf standalone/android/cabal.config
-	cabal install --only-dependencies "$@" # --force-reinstalls --reinstall
+	cabal install --only-dependencies --flags="-magicmime -concurrent-output" "$@" # --force-reinstalls --reinstall
 	rm -f cabal.config
 	popd
 }