[Libreoffice-commits] .: 3 commits - cppunit/makefile.mk cppunit/windows.patch

[Tor Lillqvist]

 cppunit/makefile.mk   |    9 ++++++++-
 cppunit/windows.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 7818fdeb188154eac80746339e6059eb7ae9f88b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 17 13:35:02 2011 +0300

    Surely we are not building Cygwin DLLs in the WNTGCC case!?

diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 5d1d1a4..d77f3fa 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -93,8 +93,11 @@ BUILD_FLAGS = install
 
 OUTDIR2INC = ooo-install/include/cppunit
 
+# WTF? A *Cygwin* DLL?
+#OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
+#    ooo-install/bin/cygcppunit-1-12-1.dll
 OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
-    ooo-install/bin/cygcppunit-1-12-1.dll
+    ooo-install/bin/libcppunit-1-12-1.dll
 OUT2LIB = ooo-install/lib/libcppunit.dll.a
 
 .INCLUDE: set_ext.mk
commit 95c2eeebf0760dea861cee15190cf3bca18f031f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 17 13:33:42 2011 +0300

    Fix compilation error with MinGW

diff --git a/cppunit/windows.patch b/cppunit/windows.patch
index fdd7607..9c510bb 100644
--- a/cppunit/windows.patch
+++ b/cppunit/windows.patch
@@ -34,3 +34,15 @@
    typedef char __CppUnitPlugInImplementMainDummyTypeDef
  
  // Unix
+--- misc/cppunit-1.12.1/include/cppunit/TestAssert.h
++++ misc/build/cppunit-1.12.1/include/cppunit/TestAssert.h
+@@ -76,7 +76,7 @@
+        const int precision = 15;
+ #endif  // #ifdef DBL_DIG
+        char buffer[128];
+-#ifdef __STDC_SECURE_LIB__ // Use secure version with visual studio 2005 to avoid warning.
++#if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with visual studio 2005 to avoid warning.
+        sprintf_s(buffer, sizeof(buffer), "%.*g", precision, x); 
+ #else	
+        sprintf(buffer, "%.*g", precision, x); 
+
commit bb3796bbc19c618854c4c9f98c9e013b98ca89d0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 17 13:25:35 2011 +0300

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

diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 3974f96..5d1d1a4 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -84,6 +84,10 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
     LDFLAGS='$(LDFLAGS)' \
     LIBS='$(MY_LIBS)'
 
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
 BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_FLAGS = install