diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-08-01 11:11:59 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-08-01 11:13:35 +0200 |
| commit | 4b2cabedaa479913e72d827983f9a60f985f4424 (patch) | |
| tree | f6afefc1394863221fe1a020a737aee28b1e7146 /external/curl | |
| parent | d76e3abe130007086099c62c5b425aaef82dc944 (diff) | |
curl: drop curl-android.patch
fixed in new upstream autoconf
Change-Id: I8c88330b2ed522a160fedac6abd962f92b32d2f0
Diffstat (limited to 'external/curl')
| -rw-r--r-- | external/curl/UnpackedTarball_curl.mk | 6 | ||||
| -rw-r--r-- | external/curl/curl-android.patch | 16 |
2 files changed, 0 insertions, 22 deletions
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index 4cde155df66f..f1e9209425ad 100644 --- a/external/curl/UnpackedTarball_curl.mk +++ b/external/curl/UnpackedTarball_curl.mk @@ -31,10 +31,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\ )) endif -ifeq ($(OS),ANDROID) -$(eval $(call gb_UnpackedTarball_add_patches,curl,\ - external/curl/curl-android.patch \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/external/curl/curl-android.patch b/external/curl/curl-android.patch deleted file mode 100644 index 8a74fb92310e..000000000000 --- a/external/curl/curl-android.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 -@@ -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 -+ -+ version_type=none -+ - # Parse the version information argument. - save_ifs=$IFS; IFS=: - set dummy $vinfo 0 0 0 |