[tor-commits] [orbot/master] update Makefile for building tor 0.2.6.4 with patch for Android

[n8fr8@xxxxxxxxxxxxxx]

commit 84e97e6c71258791c4fd048b683b3aeb05a1b56f
Author: Nathan Freitas <nathan@xxxxxxxxxxx>
Date:   Wed Mar 18 21:20:20 2015 -0400

    update Makefile for building tor 0.2.6.4 with patch for Android
---
 external/Makefile |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/external/Makefile b/external/Makefile
index 9d5e114..ecaecbe 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -180,6 +180,9 @@ tor/configure:
 	 ./autogen.sh
 
 tor/Makefile: tor/configure
+	cp fix_android_0.2.6.4rc_build.patch tor
+	cd tor && \
+		git apply fix_android_0.2.6.4rc_build.patch
 	cp config.sub tor
 	cp config.guess tor
 	cd tor && \
@@ -205,6 +208,8 @@ tor-clean:
 	-rm -f tor-build-stamp
 	-cd tor && \
 		git clean -fdx
+	-cd tor && \
+		git reset HEAD --hard
 
 #------------------------------------------------------------------------------#
 # polipo



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits