diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-09-27 17:40:43 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-09-27 17:44:17 +0200 |
| commit | e4486fe169054dde895e69a452aad94d3f3ca74a (patch) | |
| tree | 72c7c1ad989769ab7564276ceed242d638c48d90 /redland | |
| parent | 0f829ec191c944a12c63646dfc3b78f0def26c91 (diff) | |
More Android config.sub fixing.
More parse fixing for android os string.
Diffstat (limited to 'redland')
| -rw-r--r-- | redland/rasqal/makefile.mk | 2 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-0.9.16.patch.autotools | 27 | ||||
| -rw-r--r-- | redland/redland/makefile.mk | 2 | ||||
| -rw-r--r-- | redland/redland/redland-1.0.8.patch.autotools | 11 |
4 files changed, 20 insertions, 22 deletions
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index ce3a6cfff97e..dbad2d2b4c3c 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -144,7 +144,7 @@ OUT2INC+=src$/rasqal.h .IF "$(OS)"=="MACOSX" OUT2LIB+=src$/.libs$/librasqal.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib OUT2BIN+=src/rasqal-config -.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" +.ELIF "$(OS)"=="IOS" OUT2LIB+=src$/.libs$/librasqal.a OUT2BIN+=src/rasqal-config .ELIF "$(OS)"=="WNT" diff --git a/redland/rasqal/rasqal-0.9.16.patch.autotools b/redland/rasqal/rasqal-0.9.16.patch.autotools index 19b879249c5c..a8e07a377733 100644 --- a/redland/rasqal/rasqal-0.9.16.patch.autotools +++ b/redland/rasqal/rasqal-0.9.16.patch.autotools @@ -1,14 +1,23 @@ ---- misc/rasqal-0.9.16/config.sub -+++ misc/build/rasqal-0.9.16/config.sub -@@ -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* \ +--- misc/rasqal-0.9.16/config.sub 2008-06-28 19:57:26.000000000 +0200 ++++ misc/build/rasqal-0.9.16/config.sub 2011-09-27 15:08:16.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* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os +@@ -1262,7 +1262,7 @@ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ --- misc/rasqal-0.9.16/ltmain.sh Tue Apr 29 23:33:55 2008 +++ misc/build/rasqal-0.9.16/ltmain.sh Wed Feb 18 13:25:00 2009 @@ -1565,6 +1565,11 @@ diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 4bed69e2ef60..b38c45a6e7d1 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -147,7 +147,7 @@ OUT2INC+=librdf$/*.h .IF "$(OS)"=="MACOSX" OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib -.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" +.ELIF "$(OS)"=="IOS" OUT2LIB+=librdf$/.libs$/librdf.a .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" diff --git a/redland/redland/redland-1.0.8.patch.autotools b/redland/redland/redland-1.0.8.patch.autotools index 2bd20859976d..5b29d0b7708b 100644 --- a/redland/redland/redland-1.0.8.patch.autotools +++ b/redland/redland/redland-1.0.8.patch.autotools @@ -1,14 +1,3 @@ ---- misc/redland-1.0.8/config.sub -+++ misc/build/redland-1.0.8/config.sub -@@ -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* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/redland-1.0.8/configure Fri Jul 4 18:00:39 2008 +++ misc/build/redland-1.0.8/configure Wed Feb 18 13:27:43 2009 @@ -4671,7 +4671,7 @@ |