diff options
| author | Release Engineers <releng@openoffice.org> | 2009-08-06 07:01:05 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-08-06 07:01:05 +0000 |
| commit | ced0d68a1ed76ada3a4908bcc1e2b94d48fd0f47 (patch) | |
| tree | c366bc2a010959e51e6d50511daae87cf1163bd4 /stlport | |
| parent | 0c53c31250a1e5f51beee0da5b8074dd4efa745a (diff) | |
CWS-TOOLING: integrate CWS jsc320
2009-07-31 11:40:04 +0200 jsc r274518 : #103926# apply patch
2009-07-16 17:17:01 +0200 jsc r274063 : #i103311# check new Solaris compiler version ox5100
2009-07-07 17:20:41 +0200 jsc r273811 : cleanup
2009-07-07 15:21:26 +0200 jsc r273799 : #98322# correct LD_LIBRARY_PATH, sdk/lib dir instead of sdkout/platfrom/lib, all unix excepting mac
2009-07-07 15:07:05 +0200 jsc r273798 : #i98322# correct link
2009-07-07 09:43:57 +0200 jsc r273773 : #i98322# correct link path
2009-07-06 15:49:07 +0200 jsc r273749 : #i98322# correct typo
2009-07-06 14:17:27 +0200 jsc r273743 : #i103311# support sunstudio compiler 12u1, version 5.10 (which results in 0x5100)
2009-07-03 13:54:58 +0200 jsc r273693 : #i96576# support opensolaris and enhance docu to relfect usage of gmake
2009-07-02 13:12:02 +0200 jsc r273643 : #i103260# improve fix by using EXECPOST variable
2009-07-02 13:11:30 +0200 jsc r273642 : #i103260# improve fix by using EXECPOST variable
2009-07-02 13:05:35 +0200 jsc r273640 : #i103260# correct typo for windows
2009-07-02 13:01:34 +0200 jsc r273639 : #i103260# provide regview with path as argument
2009-07-01 07:18:01 +0200 jsc r273541 : CWS-TOOLING: rebase CWS jsc320 to trunk@273468 (milestone: DEV300:m51)
2009-06-30 08:01:13 +0200 jsc r273485 : #98322# include import purpenvhelper lib under windows
2009-06-10 15:07:29 +0200 jsc r272815 : CWS-TOOLING: rebase CWS jsc320 to trunk@272291 (milestone: DEV300:m49)
2009-05-27 09:36:23 +0200 jsc r272329 : #i98322# create link for purpenvhelper library in SDK
2009-05-27 09:35:41 +0200 jsc r272328 : #i98322# create link for purpenvhelpr library in SDK
2009-05-14 16:19:41 +0200 jsc r271900 : increase version number in SDK header image
2009-05-14 16:11:05 +0200 jsc r271899 : #i101408# new version 3.2
2009-05-14 15:33:47 +0200 jsc r271894 : #i99163# apply patch to correct wrong tags for autodoc
2009-05-14 14:49:58 +0200 jsc r271889 : #i99707# apply patch to remove unused code
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/STLport-4.0-sunstudio12u1.patch | 21 | ||||
| -rw-r--r-- | stlport/makefile.mk | 2 |
2 files changed, 22 insertions, 1 deletions
diff --git a/stlport/STLport-4.0-sunstudio12u1.patch b/stlport/STLport-4.0-sunstudio12u1.patch new file mode 100644 index 000000000000..49d76abbd836 --- /dev/null +++ b/stlport/STLport-4.0-sunstudio12u1.patch @@ -0,0 +1,21 @@ +--- misc/STLport-4.0/stlport/config/stl_sunpro.h Mon Jul 6 13:43:35 2009 ++++ misc/build/STLport-4.0/stlport/config/stl_sunpro.h Mon Jul 6 13:56:56 2009 +@@ -31,7 +31,8 @@ + # endif + # endif + +-# if (__SUNPRO_CC < 0x600) ++// support SunStudio compiler 12u1 version 5.10 (which results in 0x5100) ++# if (__SUNPRO_CC < 0x600 || ((__SUNPRO_CC | 0x0FFF) > 0x0FFF && __SUNPRO_CC < 0x6000)) + // those are tested and proved not to work... + # define __STL_STATIC_ARRAY_BUG 1 + # define __STL_STATIC_CONST_INIT_BUG 1 +@@ -57,7 +58,7 @@ + # define __STL_NO_FRIEND_TEMPLATES 1 + #endif + +-# if (__SUNPRO_CC < 0x600) ++# if (__SUNPRO_CC < 0x600 || ((__SUNPRO_CC | 0x0FFF) > 0x0FFF && __SUNPRO_CC < 0x6000)) + # define __STL_HAS_NO_NEW_C_HEADERS 1 + # define __STL_NO_EXPLICIT_FUNCTION_TMPL_ARGS + # define __STL_NON_TYPE_TMPL_PARAM_BUG 1 diff --git a/stlport/makefile.mk b/stlport/makefile.mk index 9689db5da3b6..ab4dfa244e72 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -77,7 +77,7 @@ $(INCCOM)$/stlport$/vector: systemstl$/$$(@:f) .ENDIF .ELSE TARFILE_NAME=STLport-4.0 - PATCH_FILES=STLport-4.0.patch + PATCH_FILES=STLport-4.0.patch STLport-4.0-sunstudio12u1.patch # To disable warnings from within STLport headers on unxsoli4 and # unxsols4, STLport-4.0.patch had to be extended mechanically by # |