diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-10-12 01:23:16 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-10-12 01:23:16 +0000 |
| commit | 6eadfc81841529afbde6f1b9c9050168dcd50a66 (patch) | |
| tree | aec373a976bfb42e35a74cf22a630db53b7da14b /dev-libs/STLport | |
| parent | fix use_multilib for amd64/ppc64 targets and add support for s390x (diff) | |
| download | historical-6eadfc81841529afbde6f1b9c9050168dcd50a66.tar.gz historical-6eadfc81841529afbde6f1b9c9050168dcd50a66.tar.bz2 historical-6eadfc81841529afbde6f1b9c9050168dcd50a66.zip | |
fix for gcc-4 #108938
Package-Manager: portage-2.0.53_rc4
Diffstat (limited to 'dev-libs/STLport')
| -rw-r--r-- | dev-libs/STLport/Manifest | 10 | ||||
| -rw-r--r-- | dev-libs/STLport/files/4.6.2-gcc-includes.patch | 11 |
2 files changed, 13 insertions, 8 deletions
diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest index 7e5463575e41..eb911a192e79 100644 --- a/dev-libs/STLport/Manifest +++ b/dev-libs/STLport/Manifest @@ -5,8 +5,7 @@ MD5 fa09b198e494a1086b748a70d8c82b98 ChangeLog 3433 MD5 3e474572fe4df01c7632a78f013c6d1e STLport-4.5.3-r3.ebuild 1086 MD5 9bc93614f7fe1e68a404de378b15d2c2 STLport-4.6.2-r2.ebuild 1290 MD5 f480213ed01d6d7700f14c15cb0f5229 STLport-5.0_rc2.ebuild 1317 -MD5 4817a0bcc65305e3dd392deee8e84e0c metadata.xml 246 -MD5 23f0d4cef12b1a0dc10be56556de2cf2 files/4.6.2-gcc-includes.patch 728 +MD5 2f3f666186f0f3ba7e64d101c9f5c05d files/4.6.2-gcc-includes.patch 812 MD5 7949a0c399ae8cd1c8c6d7ada426848f files/4.6.2-optimize.patch 999 MD5 a26aa0654153d685b61549c4290b540b files/50STLport-4.0 210 MD5 7a319fa8b6dbaf6dbf5da8833f08892c files/STLport-4.5.3-gcc3.patch 695 @@ -16,10 +15,11 @@ MD5 e4ade56502c64dc0858dd39acf14be1a files/STLport-vector.patch 1106 MD5 71f426e2327ad577fdeaa14cf17f7b19 files/digest-STLport-4.5.3-r3 65 MD5 2684edb96cbc495281b93fe12da5fcaf files/digest-STLport-4.6.2-r2 65 MD5 ed6eaa01140ef3f87b9675a4261fe9e0 files/digest-STLport-5.0_rc2 66 +MD5 4817a0bcc65305e3dd392deee8e84e0c metadata.xml 246 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDLzmqCRZPokWLroQRAjo/AKC7OikYafjB7JDVI5d2zYz2iKmlGgCgi2Th -CDoow9rqtlwavS/kTpAMai0= -=yEk3 +iD8DBQFDTGX8gIKl8Uu19MoRAlF/AJ0cjmZE4iDF/Yn2oMDwv6k7odIF6wCfXsGV +k9OYc4eL34CO905FzpmofIc= +=Pqse -----END PGP SIGNATURE----- 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 |