diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-16 12:56:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-16 12:56:15 -0400 |
| commit | 801460b80ced3d0cb1a8c206882504052a7dea0e (patch) | |
| tree | 404833f84a82b4d6646371710dfd76bad3027ee0 /standalone/android/Makefile | |
| parent | 3c70e6312528daf0b36913db64b9eedac1c4aa31 (diff) | |
pin git to known working version
Diffstat (limited to 'standalone/android/Makefile')
| -rw-r--r-- | standalone/android/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/standalone/android/Makefile b/standalone/android/Makefile index 3120d1be2..ea3d1e1cc 100644 --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -115,7 +115,8 @@ $(GIT_ANNEX_ANDROID_SOURCETREE)/busybox/build-stamp: busybox_config touch $@ $(GIT_ANNEX_ANDROID_SOURCETREE)/git/build-stamp: git.patch - cat git.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && git am) + # This is a known-good version that the patch works with. + cat git.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && git reset --hard f9dc5d65ca31cb79893e1296efe37727bf58f3f3 && git am) cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && $(MAKE) install NO_OPENSSL=1 NO_GETTEXT=1 NO_GECOS_IN_PWENT=1 NO_GETPASS=1 NO_NSEC=1 NO_MKDTEMP=1 NO_PTHREADS=1 NO_PERL=1 NO_CURL=1 NO_EXPAT=1 NO_TCLTK=1 NO_ICONV=1 HAVE_CLOCK_GETTIME= prefix= DESTDIR=installed-tree touch $@ |