Make also the libcurl library end in .so for Android

This commit is contained in:
Tor Lillqvist
2011-11-10 01:10:19 +02:00
parent ccdd1b9a25
commit f522222415
2 changed files with 20 additions and 0 deletions

15
curl/curl-android.patch Normal file
View File

@@ -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

View File

@@ -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