From 90324ccc737805cd5adc3da0e1b078847cfa998d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 10 Nov 2011 01:17:25 +0200 Subject: Make also the libxml2 library file name end in .so for Android --- libxml2/libxml2-android.patch | 15 +++++++++++++++ libxml2/makefile.mk | 4 ++++ libxml2/prj/d.lst | 1 + 3 files changed, 20 insertions(+) create mode 100644 libxml2/libxml2-android.patch diff --git a/libxml2/libxml2-android.patch b/libxml2/libxml2-android.patch new file mode 100644 index 000000000000..cbc9ff477344 --- /dev/null +++ b/libxml2/libxml2-android.patch @@ -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 diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 098d30b37dfa..1d125c19e488 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -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" diff --git a/libxml2/prj/d.lst b/libxml2/prj/d.lst index e28c52e22415..6e7bbb4da693 100644 --- a/libxml2/prj/d.lst +++ b/libxml2/prj/d.lst @@ -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 -- cgit