diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-30 19:37:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-30 19:37:42 +0100 |
| commit | 8aa5c802e371e53d16810877210dc3068e11cb9b (patch) | |
| tree | 662b79769f9a1ca764420f1f0904f0aa55436b55 /external/curl | |
| parent | loplugin:cppunitassertequals (diff) | |
| download | core-8aa5c802e371e53d16810877210dc3068e11cb9b.tar.gz core-8aa5c802e371e53d16810877210dc3068e11cb9b.zip | |
fix curl android patch to apply
Change-Id: I554f483ddf7bdc8b0347d7ae4d1fe7bb6aad8336
Diffstat (limited to 'external/curl')
| -rw-r--r-- | external/curl/curl-android.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/external/curl/curl-android.patch b/external/curl/curl-android.patch index 40cf12447dbb..8a74fb92310e 100644 --- a/external/curl/curl-android.patch +++ b/external/curl/curl-android.patch @@ -1,16 +1,16 @@ diff -ur curl-7.26.0/ltmain.sh misc/build/curl-7.26.0/ltmain.sh --- curl-7.26.0/ltmain.sh 2012-07-02 14:05:04.256112279 +0200 +++ misc/build/curl-7.26.0/ltmain.sh 2012-07-02 14:07:23.775119842 +0200 -@@ -7307,6 +7307,12 @@ - func_warning "\`-release' is ignored for convenience libraries" +@@ -8784,6 +8784,12 @@ + func_warning "'-release' is ignored for convenience libraries" else -+ # Force no versioning suffix for Android thanks to silly -+ # apkbuilder which doesn't add extra native libs unless their -+ # name ends with .so ++ # Force no versioning suffix for Android thanks to silly ++ # apkbuilder which doesn't add extra native libs unless their ++ # name ends with .so + -+ version_type=none ++ version_type=none + # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 |