diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-12-07 15:25:53 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-07 15:25:53 +0000 |
| commit | 2b53e0dd07974d82712d0fb79fb573994b5ce16c (patch) | |
| tree | 7ede1df990f67e392f1ecaeaf60b9afc029d675f /stlport | |
| parent | 02b091434cca3cbc686e54f0cf975cf73941b2b9 (diff) | |
make possible to build with c++0x
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/STLport-4.5-cxx0x.patch | 17 | ||||
| -rw-r--r-- | stlport/makefile.mk | 5 |
2 files changed, 21 insertions, 1 deletions
diff --git a/stlport/STLport-4.5-cxx0x.patch b/stlport/STLport-4.5-cxx0x.patch new file mode 100644 index 000000000000..88d96d0df6e6 --- /dev/null +++ b/stlport/STLport-4.5-cxx0x.patch @@ -0,0 +1,17 @@ +--- misc/STLport-4.5/stlport/config/stl_gcc.h ++++ misc/build/STLport-4.5/stlport/config/stl_gcc.h +@@ -239,10 +239,10 @@ + + + /* strict ANSI prohibits "long long" ( gcc) */ +-# if defined ( __STRICT_ANSI__ ) +-# undef _STLP_LONG_LONG +-// # define _STLP_STRICT_ANSI 1 +-# endif ++//# if defined ( __STRICT_ANSI__ ) ++//# undef _STLP_LONG_LONG ++//// # define _STLP_STRICT_ANSI 1 ++//# endif + + //# if !defined (__STRICT_ANSI__) || defined (__BUILDING_STLPORT) + //# define _STLP_USE_TEMPLATE_EXPORT diff --git a/stlport/makefile.mk b/stlport/makefile.mk index 907c0935cbe8..532a5dd9917e 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -63,7 +63,10 @@ $(INCCOM)$/stlport$/vector: systemstl$/$$(@:f) .IF "$(COMID)"=="gcc3" TARFILE_NAME=STLport-4.5 TARFILE_MD5=18f577b374d60b3c760a3a3350407632 - PATCH_FILES=STLport-4.5.patch STLport-4.5-gcc43_warnings.patch + PATCH_FILES=\ + STLport-4.5.patch \ + STLport-4.5-gcc43_warnings.patch \ + STLport-4.5-cxx0x.patch .ELIF "$(GUI)"=="WNT" .IF "$(CCNUMVER)"<="001300000000" TARFILE_NAME=STLport-4.0 |