diff -aur src/boost_1_36_0.orig/boost/exception/enable_current_exception.hpp src/boost_1_36_0/boost/exception/enable_current_exception.hpp --- src/boost_1_36_0.orig/boost/exception/enable_current_exception.hpp 2008-07-08 19:39:00.000000000 -0500 +++ src/boost_1_36_0/boost/exception/enable_current_exception.hpp 2008-09-06 06:38:12.305288000 -0500 @@ -87,7 +87,7 @@ public: explicit - exception_clone( T const & x ): + exception_clone( T const & x ) throw (): T(x), count_(0) { @@ -96,6 +96,10 @@ *be1 = *be2; } + ~exception_clone() throw () + { + } + private: detail::atomic_count mutable count_; diff -aur src/boost_1_36_0.orig/tools/build/v2/tools/sun.jam src/boost_1_36_0/tools/build/v2/tools/sun.jam --- src/boost_1_36_0.orig/tools/build/v2/tools/sun.jam 2007-11-15 10:31:06.000000000 -0600 +++ src/boost_1_36_0/tools/build/v2/tools/sun.jam 2008-09-06 07:06:43.689521000 -0500 @@ -17,6 +17,10 @@ generators.override sun.prebuilt : builtin.lib-generator ; generators.override sun.searched-lib-generator : searched-lib-generator ; +# Turn errors from off wave (temwhileinst = temporary instantiated +# Turn errors from pretty all of boost (wvarhidemem = very correct +# yet always violated warning regarding declaring a variable name +# that is the same as a member variable feature.extend stdlib : sun-stlport ; feature.compose sun-stlport : -library=stlport4 -library=stlport4 @@ -41,18 +45,22 @@ toolset.flags sun CONFIG_C_COMMAND $(condition) : $(command_c) ; } + # Declare generators generators.register-c-compiler sun.compile.c : C : OBJ : sun ; generators.register-c-compiler sun.compile.c++ : CPP : OBJ : sun ; # Declare flags and actions for compilation -flags sun.compile OPTIONS on : -g ; -flags sun.compile OPTIONS on : -xprofile=tcov ; -flags sun.compile OPTIONS speed : -fast ; -flags sun.compile OPTIONS space : -xO2 -xspace ; -flags sun.compile OPTIONS multi : -mt ; +flags sun.compile BUILD_OPTIONS multi : -mt ; +flags sun.compile.c++ BUILD_OPTIONS off : +d ; + +flags sun.compile VARIANT_OPTIONS on : -g ; +flags sun.compile VARIANT_OPTIONS on : -xprofile=tcov ; -flags sun.compile.c++ OPTIONS off : +d ; +feature.feature optimizeflags : : free ; +flags sun.compile OPTIMIZE_OPTIONS ; +flags sun.compile OPTIMIZE_OPTIONS speed : -fast ; +flags sun.compile OPTIMIZE_OPTIONS space : -xO2 -xspace ; # The -m32 and -m64 options are supported starting # with Sun Studio 12. On earlier compilers, the @@ -61,15 +69,15 @@ # option. # See http://svn.boost.org/trac/boost/ticket/1186 # for details. -flags sun OPTIONS 32 : -m32 ; -flags sun OPTIONS 64 : -m64 ; +flags sun ARCH_OPTIONS 32 : -m32 ; +flags sun ARCH_OPTIONS 64 : -m64 ; # On sparc, there's a difference between -Kpic # and -KPIC. The first is slightly more efficient, # but has the limits on the size of GOT table. # For minimal fuss on user side, we use -KPIC here. # See http://svn.boost.org/trac/boost/ticket/1186#comment:6 # for detailed explanation. -flags sun OPTIONS shared : -KPIC ; +flags sun ARCH_OPTIONS shared : -KPIC ; flags sun.compile OPTIONS ; flags sun.compile.c++ OPTIONS ; @@ -78,20 +86,25 @@ actions compile.c { - "$(CONFIG_C_COMMAND)" $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)" + "$(CONFIG_C_COMMAND)" $(BUILD_OPTIONS) -errtags -erroff=wvarhidemem,teminstfrom,teminstend,temwhileinst $(VARIANT_OPTIONS) $(OPTIMIZE_OPTIONS) $(OPTIONS) $(ARCH_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)" } actions compile.c++ { - "$(CONFIG_COMMAND)" $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)" + "$(CONFIG_COMMAND)" $(BUILD_OPTIONS) -errtags -erroff=wvarhidemem,teminstfrom,teminstend,temwhileinst $(VARIANT_OPTIONS) $(OPTIMIZE_OPTIONS) $(OPTIONS) $(ARCH_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)" } # Declare flags and actions for linking -flags sun.link OPTIONS on : -g ; +flags sun.link VARIANT_OPTIONS on : -g ; # Strip the binary when no debugging is needed -flags sun.link OPTIONS off : -s ; -flags sun.link OPTIONS on : -xprofile=tcov ; -flags sun.link OPTIONS multi : -mt ; +flags sun.link VARIANT_OPTIONS off : -s ; +flags sun.link VARIANT_OPTIONS on : -xprofile=tcov ; +flags sun.link BUILD_OPTIONS multi : -mt ; +flags sun.link OPTIMIZE_OPTIONS ; +flags sun.link OPTIMIZE_OPTIONS speed : -fast ; +flags sun.link OPTIMIZE_OPTIONS space : -xO2 -xspace ; +flags sun.link ARCH_OPTIONS 32 : -m32 ; +flags sun.link ARCH_OPTIONS 64 : -m64 ; flags sun.link OPTIONS ; flags sun.link LINKPATH ; flags sun.link FINDLIBS-ST ; @@ -115,7 +128,7 @@ actions link bind LIBRARIES { - "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Bdynamic -l$(FINDLIBS-SA) -Bstatic -l$(FINDLIBS-ST) -B$(LINK-RUNTIME) + "$(CONFIG_COMMAND)" $(BUILD_OPTIONS) $(STLPORT_FLAGS) $(VARIANT_OPTIONS) $(OPTIMIZE_OPTIONS) $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -Bdynamic -l$(FINDLIBS-SA) -Bstatic -l$(FINDLIBS-ST) -B$(LINK-RUNTIME) } # Slight mods for dlls @@ -126,7 +139,7 @@ actions link.dll bind LIBRARIES { - "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" -h$(<[1]:D=) -G "$(>)" "$(LIBRARIES)" -Bdynamic -l$(FINDLIBS-SA) -Bstatic -l$(FINDLIBS-ST) -B$(LINK-RUNTIME) + "$(CONFIG_COMMAND)" $(BUILD_OPTIONS) $(STLPORT_FLAGS) $(VARIANT_OPTIONS) $(OPTIMIZE_OPTIONS) $(OPTIONS) -L"$(LINKPATH)" -R"$(RPATH)" -o "$(<)" -h$(<[1]:D=) -G "$(>)" "$(LIBRARIES)" -Bdynamic -l$(FINDLIBS-SA) -Bstatic -l$(FINDLIBS-ST) -B$(LINK-RUNTIME) } # Declare action for creating static libraries