[Libreoffice-commits] .: 2 commits - hunspell/hunspell-mingw.patch hunspell/makefile.mk

[Tor Lillqvist]

 hunspell/hunspell-mingw.patch |   12 ------------
 hunspell/makefile.mk          |    9 ++++++---
 2 files changed, 6 insertions(+), 15 deletions(-)

New commits:
commit 0a983d83d508af9ee5437f49a177a18647ff3d64
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 17 23:35:37 2011 +0300

    Pass --build and --host options also when cross-compiling to Windows

diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index b363d98..d43bcb0 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -81,7 +81,13 @@ OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
 CONFIGURE_ACTION=configure
+
 CONFIGURE_FLAGS= --disable-shared --disable-nls --with-pic LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2
+
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
 BUILD_ACTION=make
 OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a
 .ELSE
commit 03f1122152b02856d9fd86c23fe241548dac2f78
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 17 23:33:43 2011 +0300

    hunspell-mingw.patch does not even apply

diff --git a/hunspell/hunspell-mingw.patch b/hunspell/hunspell-mingw.patch
deleted file mode 100644
index 391aa92..0000000
--- a/hunspell/hunspell-mingw.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- misc/hunspell-1.3.1/src/tools/hunspell.cxx	2010-02-27 23:37:14.000000000 +0900
-+++ misc/build/hunspell-1.3.1/src/tools/hunspell.cxx	2010-04-25 07:57:39.233875000 +0900
-@@ -27,7 +27,9 @@
- 
- #ifdef WIN32
- 
-+#ifndef __MINGW32__
- #define gettext
-+#endif
- #define LIBDIR "C:\\Hunspell\\"
- #define USEROOODIR "Application Data\\OpenOffice.org 2\\user\\wordbook"
- #define OOODIR \
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index a682ba0..b363d98 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -80,9 +80,6 @@ OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a
 
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-PATCH_FILES=\
-    hunspell-mingw.patch
-
 CONFIGURE_ACTION=configure
 CONFIGURE_FLAGS= --disable-shared --disable-nls --with-pic LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2
 BUILD_ACTION=make