diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-10 01:22:03 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-10 01:23:50 +0200 |
| commit | 12fea3754acabadb5f6e267497cbc9ab9e3da274 (patch) | |
| tree | 314b2946e7b3b1a10a253a7f54e6aaff7287781f /libxslt | |
| parent | 90324ccc737805cd5adc3da0e1b078847cfa998d (diff) | |
Make also the libxslt library file names end in .so for Android
Diffstat (limited to 'libxslt')
| -rw-r--r-- | libxslt/libxslt-android.patch | 15 | ||||
| -rw-r--r-- | libxslt/makefile.mk | 4 | ||||
| -rw-r--r-- | libxslt/prj/d.lst | 2 |
3 files changed, 21 insertions, 0 deletions
diff --git a/libxslt/libxslt-android.patch b/libxslt/libxslt-android.patch new file mode 100644 index 000000000000..68069d6e9457 --- /dev/null +++ b/libxslt/libxslt-android.patch @@ -0,0 +1,15 @@ +--- misc/libxslt-1.1.26/ltmain.sh ++++ misc/build/libxslt-1.1.26/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/libxslt/makefile.mk b/libxslt/makefile.mk index f884c356b0e0..2bec8bdb58ae 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -59,6 +59,10 @@ PATCH_FILES=libxslt-configure.patch \ libxslt-aix.patch \ libxslt-vc10.patch +.IF "$(OS)"=="ANDROID" +PATCH_FILES+= libxslt-android.patch +.ENDIF + # This is only for UNX environment now .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst index 74f759ebe85a..0627cc163403 100644 --- a/libxslt/prj/d.lst +++ b/libxslt/prj/d.lst @@ -2,8 +2,10 @@ mkdir: %_DEST%\inc\external\libxslt ..\%__SRC%\inc\*.h %_DEST%\inc\external\libxslt\*.h ..\%__SRC%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so.1 symlink: %_DEST%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so +..\%__SRC%\lib\libxslt.so %_DEST%\lib\libxslt.so ..\%__SRC%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so.0 symlink: %_DEST%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so +..\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so ..\%__SRC%\lib\libxslt*.* %_DEST%\lib\libxslt*.* ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\*.a ..\%__SRC%\bin\lib*.dll %_DEST%\bin |