|
 |
c9aa049 |
diff --git a/stlport/STLport-4.5.patch b/stlport/STLport-4.5.patch
|
|
|
c9aa049 |
index 27ff2ef..8476053 100644
|
|
|
c9aa049 |
--- a/stlport/STLport-4.5.patch
|
|
|
c9aa049 |
+++ b/stlport/STLport-4.5.patch
|
|
|
c9aa049 |
@@ -137,7 +137,7 @@
|
|
|
c9aa049 |
+#
|
|
|
c9aa049 |
+#
|
|
|
c9aa049 |
+LINK=ar cr
|
|
|
c9aa049 |
-+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
|
|
|
c9aa049 |
++DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} -fexceptions -shared -o
|
|
|
c9aa049 |
+
|
|
|
c9aa049 |
+OBJEXT=o
|
|
|
c9aa049 |
+DYNEXT=so
|
|
|
c9aa049 |
@@ -210,7 +210,7 @@
|
|
|
c9aa049 |
+#
|
|
|
c9aa049 |
+#
|
|
|
c9aa049 |
+LINK=ar crv
|
|
|
c9aa049 |
-+DYN_LINK=$(CXX) --fexceptions -shared -o
|
|
|
c9aa049 |
++DYN_LINK=$(CXX) -fexceptions -shared -o
|
|
|
c9aa049 |
+
|
|
|
c9aa049 |
+OBJEXT=o
|
|
|
c9aa049 |
+DYNEXT=dll
|
|
|
c9aa049 |
@@ -449,7 +449,7 @@
|
|
|
c9aa049 |
+#
|
|
|
c9aa049 |
+#
|
|
|
c9aa049 |
+LINK=ar cr
|
|
|
c9aa049 |
-+DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' --fexceptions -shared -o
|
|
|
c9aa049 |
++DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' -fexceptions -shared -o
|
|
|
c9aa049 |
+
|
|
|
c9aa049 |
+OBJEXT=o
|
|
|
c9aa049 |
+DYNEXT=so
|
|
|
d4c8ee5 |
diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
|
|
|
d4c8ee5 |
index d0ee030..5ff8668 100644
|
|
|
d4c8ee5 |
--- a/stlport/systemstlguards/preextstl.h
|
|
|
d4c8ee5 |
+++ b/stlport/systemstlguards/preextstl.h
|
|
|
ca77b4b |
@@ -48,7 +48,6 @@
|
|
|
d4c8ee5 |
# if defined(_GNUC__)
|
|
|
d4c8ee5 |
# pragma GCC visibility push(default)
|
|
|
d4c8ee5 |
# endif
|
|
|
d4c8ee5 |
-# include _STLP_NATIVE_HEADER(exception_defines.h)
|
|
|
d4c8ee5 |
# include _STLP_NATIVE_HEADER(limits)
|
|
|
1465882 |
# include _STLP_NATIVE_HEADER(memory)
|
|
|
1465882 |
# include _STLP_NATIVE_HEADER(exception)
|
|
|
ca77b4b |
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
|
|
|
ca77b4b |
index 044dfc5..1d28d05 100644
|
|
|
ca77b4b |
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
|
|
|
ca77b4b |
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
|
|
|
ca77b4b |
@@ -32,9 +32,10 @@
|
|
|
ca77b4b |
#include <stdio.h>
|
|
|
ca77b4b |
#include <string.h>
|
|
|
ca77b4b |
#include <dlfcn.h>
|
|
|
ca77b4b |
-#include <cxxabi.h>
|
|
|
ca77b4b |
#include <hash_map>
|
|
|
ca77b4b |
|
|
|
ca77b4b |
+#include <cxxabi.h>
|
|
|
ca77b4b |
+
|
|
|
ca77b4b |
#include <rtl/strbuf.hxx>
|
|
|
ca77b4b |
#include <rtl/ustrbuf.hxx>
|
|
|
ca77b4b |
#include <osl/diagnose.h>
|
|
|
ca77b4b |
@@ -47,7 +48,6 @@
|
|
|
ca77b4b |
|
|
|
ca77b4b |
#include "share.hxx"
|
|
|
ca77b4b |
|
|
|
ca77b4b |
-
|
|
|
ca77b4b |
using namespace ::std;
|
|
|
ca77b4b |
using namespace ::osl;
|
|
|
ca77b4b |
using namespace ::rtl;
|