[Libreoffice-commits] core.git: firebird/firebird-cygwin-msvc.patch.1

[Isamu Mogi]

 firebird/firebird-cygwin-msvc.patch.1 |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 70b3cae54bf3a617bc58926d2ab75b82d5cc0d51
Author: Isamu Mogi <saturday6c at gmail.com>
Date:   Sun Aug 4 19:33:31 2013 +0900

    Support to compile firebird on cygwin-64
    
    C Compiler (cl.exe, gcc-wrapper.exe) for firebird generates 32bit
    object file but windres on cygwin-64 generates 64bit one. It causes
    link error. This patch unifies these objects in 32bit.
    
    Change-Id: Ie631bdcc22eedd694c880f55101db77b9ac5f669
    Reviewed-on: https://gerrit.libreoffice.org/5273
    Reviewed-by: Tor Lillqvist <tml at iki.fi>
    Tested-by: Tor Lillqvist <tml at iki.fi>

diff --git a/firebird/firebird-cygwin-msvc.patch.1 b/firebird/firebird-cygwin-msvc.patch.1
index 084a93d..5e2368b 100644
--- a/firebird/firebird-cygwin-msvc.patch.1
+++ b/firebird/firebird-cygwin-msvc.patch.1
@@ -782,4 +782,13 @@ unchanged:
  
  clean:;		rm -f $(OBJS)
  
+unchanged:
+--- firebird.orig/builds/posix/make.rules	2013-08-04 19:06:02.208552600 +0900
++++ firebird/builds/posix/make.rules	2013-08-04 19:13:59.981368500 +0900
+@@ -116,4 +116,4 @@
+ # Rules for making resource files
+ 
+ $(GEN_ROOT)/%.res: $(SRC_ROOT)/%.rc
+-	windres --output-format=coff --include-dir=$(<D) $< $@
++	windres --output-format=coff --include-dir=$(<D) --target=pe-i386 $< $@
 only in patch2: