diff options
author | 2005-10-12 01:23:16 +0000 | |
---|---|---|
committer | 2005-10-12 01:23:16 +0000 | |
commit | 16981c9047d71796fa224f1c401c761eac3c233a (patch) | |
tree | 0811b3a4a0509475a7449b2b9e738e2139f280c7 /dev-libs/STLport | |
parent | fix use_multilib for amd64/ppc64 targets and add support for s390x (diff) | |
download | gentoo-2-16981c9047d71796fa224f1c401c761eac3c233a.tar.gz gentoo-2-16981c9047d71796fa224f1c401c761eac3c233a.tar.bz2 gentoo-2-16981c9047d71796fa224f1c401c761eac3c233a.zip |
fix for gcc-4 #108938
(Portage version: 2.0.53_rc4)
Diffstat (limited to 'dev-libs/STLport')
-rw-r--r-- | dev-libs/STLport/files/4.6.2-gcc-includes.patch | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dev-libs/STLport/files/4.6.2-gcc-includes.patch b/dev-libs/STLport/files/4.6.2-gcc-includes.patch index 8e50aae3eb9c..b4b2db6079a4 100644 --- a/dev-libs/STLport/files/4.6.2-gcc-includes.patch +++ b/dev-libs/STLport/files/4.6.2-gcc-includes.patch @@ -1,5 +1,5 @@ ---- STLport-4.6.2/stlport/config/stl_gcc.h.orig 2004-05-29 22:27:30.514737048 -0400 -+++ STLport-4.6.2/stlport/config/stl_gcc.h 2004-05-29 22:26:14.539287072 -0400 +--- STLport-4.6.2/stlport/config/stl_gcc.h ++++ STLport-4.6.2/stlport/config/stl_gcc.h @@ -7,7 +7,9 @@ # define _STLP_USE_GLIBC #endif @@ -10,12 +10,17 @@ # if defined(__FreeBSD__) || defined (__hpux) || defined(__amigaos__) || ( defined(__OS2__) && defined(__EMX__) ) # define _STLP_NO_WCHAR_T -@@ -263,7 +265,7 @@ +@@ -263,7 +265,12 @@ # if (__GNUC__ >= 3) -# if ((__GNUC_MINOR__ == 0) || (__APPLE__)) +# if 1 || ((__GNUC_MINOR__ == 0) || (__APPLE__)) ++# if __GNUC__ >= 4 ++# define _STLP_NATIVE_INCLUDE_PATH ../g++-v4 ++# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v4/backward ++# else # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward ++# endif # else |