diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-06-06 21:47:30 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-06-06 21:47:30 +0000 |
| commit | 6e22f2c4fcc0784e0ae1b66d13e72c2d49a76b24 (patch) | |
| tree | dc65de88500e51f31e8663c031a1b45458e40d5a /devel/stlport | |
| parent | d63384ce7372a739c29ea481632ef24094239747 (diff) | |
| download | ports-6e22f2c4fcc0784e0ae1b66d13e72c2d49a76b24.tar.gz ports-6e22f2c4fcc0784e0ae1b66d13e72c2d49a76b24.zip | |
Fix compile for gcc3. On CURRENT, the exception tests are failing. This
works fine on STABLE with gcc3. This is also the reason for the non working
Openoffice port, which depends on this port.
Notes
Notes:
svn path=/head/; revision=60725
Diffstat (limited to 'devel/stlport')
| -rw-r--r-- | devel/stlport/files/patch-stlport::config::stl_gcc.h | 16 | ||||
| -rw-r--r-- | devel/stlport/files/patch-stlport::cwchar | 22 |
2 files changed, 38 insertions, 0 deletions
diff --git a/devel/stlport/files/patch-stlport::config::stl_gcc.h b/devel/stlport/files/patch-stlport::config::stl_gcc.h new file mode 100644 index 000000000000..63edcf9363f9 --- /dev/null +++ b/devel/stlport/files/patch-stlport::config::stl_gcc.h @@ -0,0 +1,16 @@ +--- stlport/config/stl_gcc.h Thu Jan 10 19:41:58 2002 ++++ stlport/config/stl_gcc.h Thu Jun 6 23:15:40 2002 +@@ -250,8 +250,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) + diff --git a/devel/stlport/files/patch-stlport::cwchar b/devel/stlport/files/patch-stlport::cwchar new file mode 100644 index 000000000000..9666cff4f004 --- /dev/null +++ b/devel/stlport/files/patch-stlport::cwchar @@ -0,0 +1,22 @@ +--- stlport/cwchar.orig Thu Jan 10 19:41:56 2002 ++++ stlport/cwchar Thu Jun 6 23:24:28 2002 +@@ -21,6 +21,10 @@ + # include <stl/_prolog.h> + # endif + ++#ifdef __FreeBSD__ ++# include <../wchar.h> ++#endif ++ + # ifdef __GNUC__ + # include <cstddef> + # endif +@@ -36,7 +40,7 @@ + # elif defined (__MRC__) || defined (__SC__) || defined (__BORLANDC__) || defined(__FreeBSD__) || (defined (__GNUC__) && defined (__APPLE__) || defined( __Lynx__ )) || defined (_STLP_NO_WCHAR_T) + + # include _STLP_NATIVE_C_HEADER(stddef.h) +-# if defined (__FreeBSD__) || defined (__Lynx__) ++# if defined (__Lynx__) + # ifndef _WINT_T + typedef long int wint_t; + # define _WINT_T |