[Libreoffice-commits] .: lcms2/lcms2.patch lcms2/makefile.mk

[Tor Lillqvist]

 lcms2/lcms2.patch |   20 ++++++++++++++++++++
 lcms2/makefile.mk |    2 ++
 2 files changed, 22 insertions(+)

New commits:
commit 2f465a8863ada2b620440e239fb5e48df581253f
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Mar 12 10:51:48 2012 +0200

    Add patch to recognize Android

diff --git a/lcms2/lcms2.patch b/lcms2/lcms2.patch
new file mode 100644
index 0000000..851a4b6
--- /dev/null
+++ b/lcms2/lcms2.patch
@@ -0,0 +1,20 @@
+--- misc/build/lcms2-2.3/config.sub
++++ misc/build/lcms2-2.3/config.sub
+@@ -123,7 +123,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*)
+@@ -1294,7 +1294,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-androideabi* | -linux-newlib* | -linux-uclibc* \
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index 9369c75..7d834ac 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -39,6 +39,8 @@ TARGET=so_lcms2
 TARFILE_NAME=lcms2-2.3
 TARFILE_MD5=327348d67c979c88c2dec59a23a17d85
 
+PATCH_FILES = lcms2.patch
+
 .IF "$(SYSTEM_LCMS2)" == "YES"
 @all:
     @echo "Using system littlecms2..."