diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-20 00:44:06 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-20 01:12:25 +0200 |
| commit | 0edebb4f7984aab8778835e9d74474668ff06bf5 (patch) | |
| tree | 7488f44e459ff0d690fb96c4277448d1dac15c40 | |
| parent | 3fbac5c1c0d787a7ad5775e0f62872e117564c90 (diff) | |
Fix cairo build for Android again
| -rw-r--r-- | cairo/cairo-1.10.2.android.patch | 2 | ||||
| -rw-r--r-- | cairo/cairo-1.10.2.patch | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/cairo/cairo-1.10.2.android.patch b/cairo/cairo-1.10.2.android.patch index bd4438bfcc29..e894063f0d92 100644 --- a/cairo/cairo-1.10.2.android.patch +++ b/cairo/cairo-1.10.2.android.patch @@ -1,7 +1,7 @@ --- misc/cairo-1.10.2/build/ltmain.sh +++ misc/build/cairo-1.10.2/build/ltmain.sh @@ -3228,6 +3228,10 @@ - fi + func_warning "\`-release' is ignored for convenience libraries" else + # Force no versioning suffix for Android diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch index 6bc44c90b69b..eb0885e66b64 100644 --- a/cairo/cairo-1.10.2.patch +++ b/cairo/cairo-1.10.2.patch @@ -42,12 +42,21 @@ @mkdir -p $(CFG) --- misc/cairo-1.10.2/build/config.sub 2009-08-14 23:33:32.000000000 +0200 +++ misc/build/cairo-1.10.2/build/config.sub 2009-08-14 23:33:32.000000000 +0200 +@@ -120,7 +120,7 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) @@ -1272,7 +1272,7 @@ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -+ | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -linux-androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ |