diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-10 01:10:19 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-10 01:23:48 +0200 |
| commit | f522222415847cd253af7e8b768ea945daeed8b6 (patch) | |
| tree | 54950f638ebfd519acd50482e67cbc54c8880d54 /curl | |
| parent | ccdd1b9a2533ce5a0d5a0661e807e2a31ac825ec (diff) | |
Make also the libcurl library end in .so for Android
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/curl-android.patch | 15 | ||||
| -rw-r--r-- | curl/makefile.mk | 5 |
2 files changed, 20 insertions, 0 deletions
diff --git a/curl/curl-android.patch b/curl/curl-android.patch new file mode 100644 index 000000000000..130c88d0e3e9 --- /dev/null +++ b/curl/curl-android.patch @@ -0,0 +1,15 @@ +--- misc/curl-7.19.7/ltmain.sh ++++ misc/build/curl-7.19.7/ltmain.sh +@@ -3228,6 +3228,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 diff --git a/curl/makefile.mk b/curl/makefile.mk index 66b8d9bbbdd6..c7fca5480529 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -54,6 +54,9 @@ PATCH_FILES=\ .ENDIF .ENDIF +.IF "$(OS)" == "ANDROID" + PATCH_FILES+=curl-android.patch +.ENDIF #CONVERTFILES= \ lib$/Makefile.vc6 @@ -96,6 +99,8 @@ BUILD_FLAGS+= -j$(EXTMAXPROCESS) .IF "$(OS)"=="IOS" OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a +.ELIF "$(OS)"=="ANDROID" +OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.so .ELSE OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).? .ENDIF |