Make also the libxml2 library file name end in .so for Android

This commit is contained in:
Tor Lillqvist 2011-11-10 01:17:25 +02:00
parent f522222415
commit 90324ccc73
3 changed files with 20 additions and 0 deletions

View file

@ -0,0 +1,15 @@
--- misc/libxml2-2.7.6/ltmain.sh
+++ misc/build/libxml2-2.7.6/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

@ -63,6 +63,10 @@ PATCH_FILES+= libxml2-mingw.patch
.ENDIF
.ENDIF
.IF "$(OS)"=="ANDROID"
PATCH_FILES+= libxml2-android.patch
.ENDIF
# This is only for UNX environment now
.IF "$(OS)"=="WNT"

View file

@ -2,6 +2,7 @@ mkdir: %_DEST%\inc\external\libxml
..\%__SRC%\inc\libxml\*.h %_DEST%\inc\external\libxml\*.h
..\%__SRC%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so.2
symlink: %_DEST%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so
..\%__SRC%\lib\libxml2.so %_DEST%\lib\libxml2.so
..\%__SRC%\lib\*.lib %_DEST%\lib
..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.dll.a
..\%__SRC%\lib\libxml2.a %_DEST%\lib\libxml2.a