[Libreoffice-commits] .: 2 commits - stlport/STLport-4.5.patch stlport/systemstlguards

[Caolán McNamara]

 stlport/STLport-4.5.patch           |    6 +++---
 stlport/systemstlguards/preextstl.h |    1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 894383751e0650a7d22bd5338f2df65a69c77250
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 27 13:44:37 2011 +0000

    don't want to include internal headers

diff --git a/stlport/systemstlguards/preextstl.h b/stlport/systemstlguards/preextstl.h
index d0ee030..5ff8668 100644
--- a/stlport/systemstlguards/preextstl.h
+++ b/stlport/systemstlguards/preextstl.h
@@ -48,7 +48,6 @@
 #       if defined(_GNUC__)
 #           pragma GCC visibility push(default)
 #       endif
-#       include _STLP_NATIVE_HEADER(exception_defines.h)
 #       include _STLP_NATIVE_HEADER(limits)
 #       if !defined(__GXX_EXPERIMENTAL_CXX0X__)
 #           include _STLP_NATIVE_HEADER(memory)
commit 488a4dd14cba6231d33ed0f86e45bf68c9109a11
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 27 13:15:58 2011 +0000

    --fexceptions -> -fexceptions

diff --git a/stlport/STLport-4.5.patch b/stlport/STLport-4.5.patch
index 27ff2ef..8476053 100644
--- a/stlport/STLport-4.5.patch
+++ b/stlport/STLport-4.5.patch
@@ -137,7 +137,7 @@
 +#
 +#
 +LINK=ar cr
-+DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} --fexceptions -shared -o
++DYN_LINK=${CXX} -Wl,-rpath,'$$ORIGIN' ${PTHREAD_LIBS} -fexceptions -shared -o
 +
 +OBJEXT=o
 +DYNEXT=so
@@ -210,7 +210,7 @@
 +#
 +#
 +LINK=ar crv
-+DYN_LINK=$(CXX) --fexceptions -shared -o
++DYN_LINK=$(CXX) -fexceptions -shared -o
 +
 +OBJEXT=o
 +DYNEXT=dll
@@ -449,7 +449,7 @@
 +#
 +#
 +LINK=ar cr
-+DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' --fexceptions -shared -o
++DYN_LINK=$(CXX) -Wl,-rpath,'$$ORIGIN' -fexceptions -shared -o
 +
 +OBJEXT=o
 +DYNEXT=so