summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-01-07 14:49:04 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-01-07 14:49:04 -0400
commita6548a48d0de97c3ee9836806eef3df634ef847c (patch)
treec8a5a21ae51121f6b40aeb62ecf9fb1fe19a7128
parent1cbd583c70e1ff05b56356dbebeed2f6864d4f51 (diff)
fix BIGNUM related openssh build breakage
-rw-r--r--standalone/android/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/standalone/android/Makefile b/standalone/android/Makefile
index f6ae8fdba..261259bf4 100644
--- a/standalone/android/Makefile
+++ b/standalone/android/Makefile
@@ -21,6 +21,9 @@ $(GIT_ANNEX_ANDROID_SOURCETREE):
git clone git://github.com/jackpal/Android-Terminal-Emulator.git $(GIT_ANNEX_ANDROID_SOURCETREE)/term
$(GIT_ANNEX_ANDROID_SOURCETREE)/openssl/build-stamp:
+ # This is a version which the openssh below can build with.
+ # Newer versions changed something to do with BIGNUM.
+ cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl && git reset --hard 616f71e486d693991b594439c884ec624b32c2d4
cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl && CC=$$(which cc) ./Configure android
cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl && $(MAKE)
touch $@