diff options
| author | mbr <mbr@FreeBSD.org> | 2002-08-02 23:59:08 +0000 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2002-08-02 23:59:08 +0000 |
| commit | 46de257af307e07fcd914e7bd5dddbbbbc821e44 (patch) | |
| tree | f3e2036d13218a7c83aa1ecb5f69a29ed42810a9 /editors/openoffice.org-2-RC | |
| parent | 7e72a4144cf253c22aeccdd03ebeb151fc14eda5 (diff) | |
| download | FreeBSD-ports-46de257af307e07fcd914e7bd5dddbbbbc821e44.zip FreeBSD-ports-46de257af307e07fcd914e7bd5dddbbbbc821e44.tar.gz | |
The gcc31 port has been updated. It seems that g++ includes are again in
g++-v3. In all preview version they where located in g++.
Remove part of this patch, so OO builds again with gcc31 (release)
Diffstat (limited to 'editors/openoffice.org-2-RC')
| -rw-r--r-- | editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch b/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch index 8c482fe..2a34de0 100644 --- a/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch +++ b/editors/openoffice.org-2-RC/files/patch-stlport+STLport-4.5.patch @@ -1,6 +1,6 @@ --- ../stlport/STLport-4.5.patch.orig Mon Jan 14 18:33:17 2002 +++ ../stlport/STLport-4.5.patch Tue May 28 23:55:42 2002 -@@ -174,3 +174,138 @@ +@@ -174,3 +174,110 @@ class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE { public: __Named_exception(const string& __str) @@ -111,31 +111,3 @@ + # include <stl/_cwchar.h> + + # if (_STLP_OUTERMOST_HEADER_ID == 0x120) -+--- misc/STLport-4.5/stlport/config/stl_gcc.h.orig Tue May 28 23:46:40 2002 -++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h Tue May 28 23:54:30 2002 -+@@ -226,8 +226,13 @@ -+ -+ # if (__GNUC__ >= 3) -+ -++#ifdef __FreeBSD__ -++# define _STLP_NATIVE_INCLUDE_PATH ../g++ -++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++/backward -++#else -+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 -+ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward -++#endif -+ -+ # elif (__GNUC_MINOR__ < 8) -+ -+@@ -261,7 +266,11 @@ -+ # if defined(__DJGPP) -+ # define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx -+ # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97) -++#ifdef __FreeBSD__ -++# define _STLP_NATIVE_INCLUDE_PATH ../include/g++ -++#else -+ # define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3 -++#endif -+ # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) ) -+ # define _STLP_NATIVE_INCLUDE_PATH ../g++-3 -+ # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3) |
