From 2f0d1f09eba36fcae6d3c97e234abc73dc1ef0b3 Mon Sep 17 00:00:00 2001
From: tono <tono@openoffice.org>
Date: Mon, 31 May 2010 21:53:32 +0900
Subject: i#111958: MinGW port enhancement: runtime-pseude-reloc-v2

---
 cppunit/makefile.mk | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'cppunit')

diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index b57c341e2a23..cd96f3bf2707 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -71,6 +71,11 @@ $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
 
 .ELSE
 
+.IF "$(OS)" == "WNT"
+EXTRA_CFLAGS += -mthreads
+LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2
+.ENDIF
+
 .IF "$(USE_SYSTEM_STL)" != "YES"
 
 OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl
-- 
cgit 


From 8b741ce734483fc7e463de71451009b948aaa911 Mon Sep 17 00:00:00 2001
From: tono <tono@openoffice.org>
Date: Tue, 15 Jun 2010 22:33:46 +0900
Subject: i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 relevant
 fix

---
 cppunit/makefile.mk | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'cppunit')

diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 0ec7fcb696d6..883a83ff2317 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -40,7 +40,8 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch
     # warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
     #  aid=2912630&group_id=11795&atid=311795>
 
-.IF "$(OS)" == "WNT" && "$(COM)" == "MSC"
+.IF "$(OS)" == "WNT"
+.IF "$(COM)" == "MSC"
 
 # On Windows, CppUnit appears to support either the Unix-style configure/make
 # approach with cygwin and gcc (and libtool fails miserably if gcc is replaced
@@ -70,11 +71,12 @@ OUTDIR2INC = include/cppunit
 $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
 
 .ELSE
-
-.IF "$(OS)" == "WNT"
+.IF "$(COM)" == "GCC"
 EXTRA_CFLAGS += -mthreads
 LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2
-.ENDIF
+.ENDIF # "$(COM)" == "GCC"
+.ENDIF # "$(COM)" == "MSC"
+.ELSE
 
 .IF "$(USE_SYSTEM_STL)" != "YES"
 
-- 
cgit 


From 6dcf4ddec31de866816fc788ee07d60f8853caa0 Mon Sep 17 00:00:00 2001
From: tono <tono@openoffice.org>
Date: Sun, 20 Jun 2010 01:08:33 +0900
Subject: i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 more
 relevant fix

---
 cppunit/makefile.mk | 41 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 5 deletions(-)

(limited to 'cppunit')

diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 883a83ff2317..aae2d45053c9 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -74,8 +74,44 @@ $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
 .IF "$(COM)" == "GCC"
 EXTRA_CFLAGS += -mthreads
 LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2
+
+.IF "$(USE_SYSTEM_STL)" != "YES"
+
+OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl
+.IF "$(USE_STLP_DEBUG)" == "TRUE"
+OOO_STLPORT_CXXFLAGS += -D_STLP_DEBUG
+.END
+OOO_STLPORT_CXXFLAGS += -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
+
+OOO_STLPORT_LDFLAGS = -L$(SOLARLIBDIR)
+OOO_STLPORT_LIBS = $(LIBSTLPORT)
+
+.END
+
+CONFIGURE_ACTION = ./configure
+CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
+    pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
+    --disable-dependency-tracking --disable-static --disable-doxygen \
+    --disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
+    CXXFLAGS='$(EXTRA_CFLAGS) $(OOO_STLPORT_CXXFLAGS)' \
+    LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
+    LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
+
+BUILD_ACTION = $(GNUMAKE)
+BUILD_FLAGS = install
+
+OUTDIR2INC = ooo-install/include/cppunit
+
+OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
+    ooo-install/bin/cygcppunit-1-12-1.dll
+
+.INCLUDE: set_ext.mk
+.INCLUDE: target.mk
+.INCLUDE: tg_ext.mk
+
 .ENDIF # "$(COM)" == "GCC"
 .ENDIF # "$(COM)" == "MSC"
+
 .ELSE
 
 .IF "$(USE_SYSTEM_STL)" != "YES"
@@ -139,10 +175,6 @@ BUILD_FLAGS = install
 
 OUTDIR2INC = ooo-install/include/cppunit
 
-.IF "$(OS)" == "WNT"
-OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
-    ooo-install/bin/cygcppunit-1-12-1.dll
-.ELSE
 OUT2BIN = ooo-install/bin/DllPlugInTester
 .IF "$(OS)" == "MACOSX"
 OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib
@@ -150,7 +182,6 @@ EXTRPATH = NONE
 .ELSE
 OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1
 .END
-.END
 
 .INCLUDE: set_ext.mk
 .INCLUDE: target.mk
-- 
cgit