[Libreoffice-commits] .: 2 commits - external/gcc3_specific hyphen/hyphen-2.7.1.patch

[Tor Lillqvist]

 external/gcc3_specific/makefile.mk |   12 +-----------
 hyphen/hyphen-2.7.1.patch          |   11 +++++++++++
 2 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit 914d535bd09d541dc1c4f499c4787535c7efdc3b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jun 9 19:43:02 2011 +0300

    Cross-compilation support for Android

diff --git a/hyphen/hyphen-2.7.1.patch b/hyphen/hyphen-2.7.1.patch
index 0e8eafa..f444955 100644
--- a/hyphen/hyphen-2.7.1.patch
+++ b/hyphen/hyphen-2.7.1.patch
@@ -1,3 +1,14 @@
+--- misc/hyphen-2.7.1/config.sub
++++ misc/build/hyphen-2.7.1/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* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- misc/hyphen-2.7.1/Makefile.am	2010-07-19 11:23:17.000000000 +0200
 +++ misc/build/hyphen-2.7.1/Makefile.am	2010-12-02 10:15:44.390625000 +0100
 @@ -25,14 +25,13 @@
commit 85c652dee43b2ad2453d9ed8ccf81a5efbc8cb94
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jun 9 19:10:07 2011 +0300

    Don't do this for Android either

diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index 53765c9..d40468c 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -48,12 +48,7 @@ $(MINGWGXXDLL) :
 
 .IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3"
 
-.IF "$(OS)"!="MACOSX"
-.IF "$(OS)"!="IOS"
-.IF "$(OS)"!="FREEBSD"
-.IF "$(OS)"!="NETBSD"
-.IF "$(OS)"!="OPENBSD"
-.IF "$(OS)"!="DRAGONFLY"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
 
 .EXPORT : CC
 
@@ -80,11 +75,6 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) :
 
 .ENDIF
 
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF 
 .ENDIF 
 
 .ENDIF