Joey Hess 
								
							 
						 
						
							
							
								
							
							
	6bff8291f1  
						 
						
							
							
								
								
								Merge orca:/tmp/build  
							
							
							
						 
						
							2014-07-14 17:57:50 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	4aa9265042  
						 
						
							
							
								
								
								refresh haskell patches  
							
							
							
						 
						
							2014-07-14 17:58:13 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	f268c2c8ee  
						 
						
							
							
								
								
								remove bloomfilter patch no longer needed  
							
							
							
						 
						
							2014-07-14 16:55:48 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	995cb05408  
						 
						
							
							
								
								
								update android haskell patches  
							
							
							
						 
						
							2014-07-04 00:47:49 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	d86b8368db  
						 
						
							
							
								
								
								skein patch seems to be needed for arm as well as android  
							
							... 
							
							
							
							I don't understand why this patch is needed. 
							
						 
						
							2014-06-10 14:13:50 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	0fcc805bc9  
						 
						
							
							
								
								
								vector patch also needed for arm  
							
							
							
						 
						
							2014-06-10 12:42:09 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	ba1e14d502 
 
						 
						
							
							
								
								
								fix gnutls to link, again  
							
							... 
							
							
							
							I don't know why, but I keep finding that the way I hacked this to work
before doesn't work and a new way is needed. Perhaps changes to cabal made
my old hacks break? 
							
						 
						
							2014-05-26 17:56:41 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	69f793a2b2 
 
						 
						
							
							
								
								
								update path to gnutls etc libs  
							
							
							
						 
						
							2014-05-26 15:51:21 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	70fd42521f 
 
						 
						
							
							
								
								
								remove patch that turns out to be unnecessary  
							
							
							
						 
						
							2014-05-26 13:14:50 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	fb3b1fac54  
						 
						
							
							
								
								
								Merge orca:/tmp/build  
							
							
							
						 
						
							2014-05-25 22:51:57 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									androidbuilder 
								
							 
						 
						
							
							
								
							
							
	0f5b40a106  
						 
						
							
							
								
								
								update remaining android patches  
							
							
							
						 
						
							2014-05-26 02:47:15 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	ddb1f25209  
						 
						
							
							
								
								
								network-protocol-xmpp patch no longer needed  
							
							
							
						 
						
							2014-05-25 21:59:13 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	1f05bcea98  
						 
						
							
							
								
								
								libxml-sax patch no longer needed  
							
							
							
						 
						
							2014-05-25 21:57:53 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sören Brunk 
								
							 
						 
						
							
							
								
							
							
	5e9e9d3cc7  
						 
						
							
							
								
								
								update android haskell patches  
							
							
							
						 
						
							2014-05-25 10:04:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	2b75beaf4f  
						 
						
							
							
								
								
								got tasty-rerun working on android  
							
							
							
						 
						
							2014-03-12 12:25:32 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	
	
	8101b964b7 
 
						 
						
							
							
								
								
								fix filename  
							
							
							
						 
						
							2014-02-11 01:18:29 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	b914620264  
						 
						
							
							
								
								
								remove no longer needed patch  
							
							
							
						 
						
							2014-02-10 23:32:56 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	f271d86ef6  
						 
						
							
							
								
								
								add android patch for x509-system cert store  
							
							
							
						 
						
							2014-02-11 02:50:51 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	e3a50f4abb  
						 
						
							
							
								
								
								refresh patches  
							
							
							
						 
						
							2014-02-08 13:26:54 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	e0c4b52996  
						 
						
							
							
								
								
								added back lost certificate path fix for Android  
							
							
							
						 
						
							2014-02-07 14:20:35 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	8d3dc1bfbc  
						 
						
							
							
								
								
								disable NODELAY on android  
							
							... 
							
							
							
							and also refresh another patch 
							
						 
						
							2013-12-30 00:41:19 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	01bd650e2d  
						 
						
							
							
								
								
								refreshed android patches  
							
							
							
						 
						
							2013-12-27 00:32:29 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	b09613ebc7  
						 
						
							
							
								
								
								update haskell patches for new versions in hackage  
							
							
							
						 
						
							2013-12-26 16:17:31 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	ccef06da41  
						 
						
							
							
								
								
								allow building webapp with EvilSplicer for non-android arm  
							
							... 
							
							
							
							Was able to reuse many of the android patches, but several had to be
re-done. On Android, ghc is a stage2 build, so can compile, but not run TH
code. But debian's ghc on armel cannot even compile TH code, so it has
to be patched out.
Some haskell packages have been updated to new versions, including yesod
and DAV, and their patches had to be redone.
The Makefile now has 2 new targets. The first is run on a companion x86
system to do the build and get TH splices. Then the second target is run
the same source tree on the arm system to build without needing TH.
This commit was sponsored by Svenne Krap. 
							
						 
						
							2013-12-18 21:41:17 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	13b0bf17d9  
						 
						
							
							
								
								
								begin work on installing TH-using dependencies of webapp, for standalone armel build  
							
							... 
							
							
							
							Will move common patches out of android/haskell-patches. 
							
						 
						
							2013-12-16 23:05:00 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	b2e9339b57  
						 
						
							
							
								
								
								Android: Fix SRV record lookups for XMPP to use android getprop command to find DNS server, since there is no resolv.conf.  
							
							
							
						 
						
							2013-12-03 13:14:49 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	857548e1b7  
						 
						
							
							
								
								
								fix gnutls  
							
							
							
						 
						
							2013-11-26 19:19:47 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	22462ed891  
						 
						
							
							
								
								
								fix ugly hardcoded library path to libgnutls and libnettle  
							
							
							
						 
						
							2013-11-26 13:45:09 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	d128d1aae6  
						 
						
							
							
								
								
								update to arm-linux-androideabi-4.8 and current cabal  
							
							
							
						 
						
							2013-11-11 00:04:04 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	acd28220c7  
						 
						
							
							
								
								
								refresh patches to current hackage versions  
							
							
							
						 
						
							2013-10-18 22:44:06 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	41f80fef9f  
						 
						
							
							
								
								
								remove patches that have been applied upstream  
							
							... 
							
							
							
							WTF?! My birthday is not until April 11th 
							
						 
						
							2013-10-18 21:59:48 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	bfc7fb817c  
						 
						
							
							
								
								
								remove no longer needed patch  
							
							
							
						 
						
							2013-10-18 19:15:04 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	ebd9f70ceb  
						 
						
							
							
								
								
								remove patch that is no longer needed  
							
							
							
						 
						
							2013-10-18 19:05:33 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	eeb4182cb2  
						 
						
							
							
								
								
								update some patches for new versions  
							
							
							
						 
						
							2013-10-18 16:19:22 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	31b5ef6463  
						 
						
							
							
								
								
								fix unix-time  
							
							
							
						 
						
							2013-09-23 00:14:48 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	00a12afffe  
						 
						
							
							
								
								
								successfully builds (except XMPP)  
							
							
							
						 
						
							2013-09-22 19:13:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	f10bae49d4  
						 
						
							
							
								
								
								remove unused patches (2000+ lines!)  
							
							
							
						 
						
							2013-09-22 01:43:52 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									foo 
								
							 
						 
						
							
							
								
							
							
	2889211efd  
						 
						
							
							
								
								
								refresh haskell package patches for new android build  
							
							... 
							
							
							
							Android build is now almost entirely automated, except for the installation
of cross-built libs needed for XMPP.
Haskell packages updated to current newest versions. Am not currently
pinning the versions, as that didn't work out last time I tried it
(must have missed some pins before). 
							
						 
						
							2013-09-22 01:43:28 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	66b1493f78  
						 
						
							
							
								
								
								patched DNS library to use getprop to find the DNS server (dunno if it will work)  
							
							
							
						 
						
							2013-05-15 20:55:32 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	991d09139d  
						 
						
							
							
								
								
								add DNS library to Android build environment  
							
							
							
						 
						
							2013-05-15 19:11:09 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	f19e0d9f80  
						 
						
							
							
								
								
								fix TLS certificate handling on Android  
							
							
							
						 
						
							2013-05-09 12:38:26 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	8fe53c78c9  
						 
						
							
							
								
								
								fix unix-time build to include cbits, and fix cbits to build  
							
							
							
						 
						
							2013-05-08 14:01:47 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	d5cd86b977  
						 
						
							
							
								
								
								finally got a clean build all the way through of all haskell libs  
							
							
							
						 
						
							2013-05-08 02:20:52 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	b0e4a2f74a  
						 
						
							
							
								
								
								fixes  
							
							
							
						 
						
							2013-05-07 19:36:45 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	cb8fc922dd  
						 
						
							
							
								
								
								Merge branch 'master' of ssh://git-annex.branchable.com  
							
							
							
						 
						
							2013-05-07 19:18:39 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	ff942cc7ee  
						 
						
							
							
								
								
								Merge branch 'master' of ssh://git-annex.branchable.com  
							
							
							
						 
						
							2013-05-07 19:18:23 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	57767270d6  
						 
						
							
							
								
								
								more patch cleanup  
							
							
							
						 
						
							2013-05-07 19:18:21 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	ed58743953  
						 
						
							
							
								
								
								remove unused patch  
							
							
							
						 
						
							2013-05-07 19:17:22 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	a54402a047  
						 
						
							
							
								
								
								add  
							
							
							
						 
						
							2013-05-07 18:18:01 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joey Hess 
								
							 
						 
						
							
							
								
							
							
	f13f9a6a7b  
						 
						
							
							
								
								
								add  
							
							
							
						 
						
							2013-05-07 17:53:44 -04:00