diff options
Diffstat (limited to 'devel/boost-libs/files')
4 files changed, 105 insertions, 92 deletions
diff --git a/devel/boost-libs/files/patch-Jamroot b/devel/boost-libs/files/patch-Jamroot index 3b8f07c6ec50..7903f6daf682 100644 --- a/devel/boost-libs/files/patch-Jamroot +++ b/devel/boost-libs/files/patch-Jamroot @@ -1,20 +1,11 @@ ---- Jamroot.orig-orig 2009-07-06 20:50:54.000000000 +0400 -+++ Jamroot 2009-07-06 20:52:21.000000000 +0400 -@@ -333,7 +333,7 @@ - # suffixes either. Pgi compilers can not accept library with version - # suffix. - if $(type) = SHARED_LIB && -- ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) && -+ ( ! ( [ $(property-set).get <target-os> ] in windows freebsd cygwin darwin aix ) && - ! ( [ $(property-set).get <toolset> ] in pgi ) ) - { - result = $(result).$(BOOST_VERSION) ; -@@ -356,7 +356,7 @@ - # suffixes either. Pgi compilers can not accept library with version - # suffix. - if $(type) = SHARED_LIB && -- ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) && -+ ( ! ( [ $(property-set).get <target-os> ] in windows freebsd cygwin darwin aix ) && - ! ( [ $(property-set).get <toolset> ] in pgi ) ) - { - result = $(result).$(BOOST_VERSION) ; +--- Jamroot.orig 2009-09-23 16:35:49.000000000 +0400 ++++ Jamroot 2009-09-23 16:36:49.000000000 +0400 +@@ -384,7 +384,7 @@ + # suffixes either. Pgi compilers can not accept library with version + # suffix. + if $(type) = SHARED_LIB && +- ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) && ++ ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix freebsd ) && + ! ( [ $(property-set).get <toolset> ] in pgi ) ) + { + result = $(result).$(BOOST_VERSION) ; diff --git a/devel/boost-libs/files/patch-boost_archive_shared_ptr_helper.hpp b/devel/boost-libs/files/patch-boost_archive_shared_ptr_helper.hpp new file mode 100644 index 000000000000..ae744ebdafcf --- /dev/null +++ b/devel/boost-libs/files/patch-boost_archive_shared_ptr_helper.hpp @@ -0,0 +1,18 @@ +Index: boost/archive/shared_ptr_helper.hpp +=================================================================== +--- boost/archive/shared_ptr_helper.hpp (revision 55789) ++++ boost/archive/shared_ptr_helper.hpp (revision 57981) +@@ -109,5 +110,5 @@ + static const boost::serialization::extended_type_info * + get_object_identifier(T & t){ +- return boost::serialization::singleton< ++ return & boost::serialization::singleton< + BOOST_DEDUCED_TYPENAME + boost::serialization::type_info_implementation<T>::type +@@ -158,5 +159,5 @@ + result_type r = + get_od( +- t, ++ static_cast<void *>(t), + true_type, + this_type diff --git a/devel/boost-libs/files/patch-boost_test_impl_execution_monitor.ipp b/devel/boost-libs/files/patch-boost_test_impl_execution_monitor.ipp index e7f0e1f1ec2a..2b8a4174d77c 100644 --- a/devel/boost-libs/files/patch-boost_test_impl_execution_monitor.ipp +++ b/devel/boost-libs/files/patch-boost_test_impl_execution_monitor.ipp @@ -1,65 +1,60 @@ ---- boost/test/impl/execution_monitor.ipp Mon Oct 13 12:20:26 2008 -+++ boost/test/impl/execution_monitor.ipp Sun Nov 9 00:36:42 2008 -@@ -289,50 +289,11 @@ - +--- boost/test/impl/execution_monitor.ipp.orig 2009-09-23 16:44:57.000000000 +0400 ++++ boost/test/impl/execution_monitor.ipp 2009-09-23 16:59:44.000000000 +0400 +@@ -319,48 +319,7 @@ switch( m_sig_info->si_signo ) { case SIGILL: -- switch( m_sig_info->si_code ) { + switch( m_sig_info->si_code ) { +-#ifndef BOOST_TEST_LIMITED_SIGNAL_DETAILS - case ILL_ILLOPC: - report_error( execution_exception::system_fatal_error, - "signal: illegal opcode; address of failing instruction: 0x%08lx", - m_sig_info->si_addr ); - break; -- case ILL_ILLOPN: +- case ILL_ILLTRP: - report_error( execution_exception::system_fatal_error, -- "signal: illegal operand; address of failing instruction: 0x%08lx", +- "signal: illegal trap; address of failing instruction: 0x%08lx", - m_sig_info->si_addr ); - break; -- case ILL_ILLADR: +- case ILL_PRVREG: - report_error( execution_exception::system_fatal_error, -- "signal: illegal addressing mode; address of failing instruction: 0x%08lx", +- "signal: privileged register; address of failing instruction: 0x%08lx", - m_sig_info->si_addr ); - break; -- case ILL_ILLTRP: +- case ILL_BADSTK: - report_error( execution_exception::system_fatal_error, -- "signal: illegal trap; address of failing instruction: 0x%08lx", +- "signal: internal stack error; address of failing instruction: 0x%08lx", - m_sig_info->si_addr ); - break; -- case ILL_PRVOPC: +-#endif +- case ILL_ILLOPN: - report_error( execution_exception::system_fatal_error, -- "signal: privileged opcode; address of failing instruction: 0x%08lx", +- "signal: illegal operand; address of failing instruction: 0x%08lx", - m_sig_info->si_addr ); - break; -- case ILL_PRVREG: +- case ILL_ILLADR: - report_error( execution_exception::system_fatal_error, -- "signal: privileged register; address of failing instruction: 0x%08lx", +- "signal: illegal addressing mode; address of failing instruction: 0x%08lx", - m_sig_info->si_addr ); - break; -- case ILL_COPROC: +- case ILL_PRVOPC: - report_error( execution_exception::system_fatal_error, -- "signal: co-processor error; address of failing instruction: 0x%08lx", +- "signal: privileged opcode; address of failing instruction: 0x%08lx", - m_sig_info->si_addr ); - break; -- case ILL_BADSTK: +- case ILL_COPROC: - report_error( execution_exception::system_fatal_error, -- "signal: internal stack error; address of failing instruction: 0x%08lx", +- "signal: co-processor error; address of failing instruction: 0x%08lx", - m_sig_info->si_addr ); - break; -- } -+ // FreeBSD 6.2 does not provide details for this signal as required by SUSv3 -+ report_error( execution_exception::system_fatal_error, -+ "signal: SIGILL (illegal instruction)" ); - break; -- -+ - case SIGFPE: - switch( m_sig_info->si_code ) { - case FPE_INTDIV: -@@ -379,73 +340,21 @@ - break; ++ // FreeBSD 6.x does not provide details for this signal as required by SUSv3 + default: + report_error( execution_exception::system_fatal_error, + "signal: SIGILL, si_code: %d (illegal instruction; address of failing instruction: 0x%08lx)", +@@ -421,18 +380,7 @@ case SIGSEGV: -- switch( m_sig_info->si_code ) { + switch( m_sig_info->si_code ) { +-#ifndef BOOST_TEST_LIMITED_SIGNAL_DETAILS - case SEGV_MAPERR: - report_error( execution_exception::system_fatal_error, - "memory access violation at address: 0x%08lx: no mapping at fault address", @@ -70,14 +65,16 @@ - "memory access violation at address: 0x%08lx: invalid permissions", - m_sig_info->si_addr ); - break; -- } -+ // FreeBSD 6.2 does not provide details for this signal as required by SUSv3 -+ report_error( execution_exception::system_fatal_error, -+ "signal: SIGSEGV (invalid memory reference)" ); - break; +-#endif ++ // FreeBSD 6.x does not provide details for this signal as required by SUSv3 + default: + report_error( execution_exception::system_fatal_error, + "signal: SIGSEGV, si_code: %d (memory access violation at address: 0x%08lx)", +@@ -443,23 +391,7 @@ case SIGBUS: -- switch( m_sig_info->si_code ) { + switch( m_sig_info->si_code ) { +-#ifndef BOOST_TEST_LIMITED_SIGNAL_DETAILS - case BUS_ADRALN: - report_error( execution_exception::system_fatal_error, - "memory access violation at address: 0x%08lx: invalid address alignment", @@ -93,14 +90,16 @@ - "memory access violation at address: 0x%08lx: object specific hardware error", - m_sig_info->si_addr ); - break; -- } -+ // FreeBSD 6.2 does not provide details for this signal as required by SUSv3 -+ report_error( execution_exception::system_fatal_error, -+ "signal: SIGBUS (access to an undefined portion of a memory object)" ); - break; +-#endif ++ // FreeBSD 6.x does not provide details for this signal as required by SUSv3 + default: + report_error( execution_exception::system_fatal_error, + "signal: SIGSEGV, si_code: %d (memory access violation at address: 0x%08lx)", +@@ -470,38 +402,7 @@ case SIGCHLD: -- switch( m_sig_info->si_code ) { + switch( m_sig_info->si_code ) { +-#ifndef BOOST_TEST_LIMITED_SIGNAL_DETAILS - case CLD_EXITED: - report_error( execution_exception::system_error, - "child has exited; pid: %d; uid: %d; exit value: %d", @@ -131,20 +130,25 @@ - "stopped child had continued; pid: %d; uid: %d; exit value: %d", - (int)m_sig_info->si_pid, (int)m_sig_info->si_uid, (int)m_sig_info->si_status ); - break; -- } -+ // FreeBSD 6.2 does not provide details for this signal as required by SUSv3 -+ report_error( execution_exception::system_error, -+ "signal: SIGCHLD (child process terminated, stopped, or continued)" ); - break; - - #if defined(BOOST_TEST_CATCH_SIGPOLL) -@@ -695,7 +604,8 @@ +-#endif ++ // FreeBSD 6.x does not provide details for this signal as required by SUSv3 + default: + report_error( execution_exception::system_error, + "signal: SIGCHLD, si_code: %d (child process has terminated; pid: %d; uid: %d; exit value: %d)", +@@ -771,15 +672,7 @@ static bool ignore_sigchild( siginfo_t* info ) { -- return info->si_signo == SIGCHLD && info->si_code == CLD_EXITED -+ // for now just use an assumption that children always exit normally -+ return true //info->si_signo == SIGCHLD && info->si_code == CLD_EXITED - #ifdef BOOST_TEST_IGNORE_NON_ZERO_CHILD_CODE - ; - #else +- return info->si_signo == SIGCHLD +-#ifndef BOOST_TEST_LIMITED_SIGNAL_DETAILS +- && info->si_code == CLD_EXITED +-#endif +-#ifdef BOOST_TEST_IGNORE_NON_ZERO_CHILD_CODE +- ; +-#else +- && (int)info->si_status == 0; +-#endif ++ return info->si_signo == SIGCHLD && (int)info->si_status == 0; + } + + //____________________________________________________________________________// diff --git a/devel/boost-libs/files/patch-tools_build_v2_tools_common.jam b/devel/boost-libs/files/patch-tools_build_v2_tools_common.jam index 68683f173aee..cc306b204292 100644 --- a/devel/boost-libs/files/patch-tools_build_v2_tools_common.jam +++ b/devel/boost-libs/files/patch-tools_build_v2_tools_common.jam @@ -1,17 +1,17 @@ ---- tools/build/v2/tools/common.jam.orig Thu Oct 16 12:42:03 2008 -+++ tools/build/v2/tools/common.jam Tue Nov 11 23:43:27 2008 -@@ -760,14 +760,6 @@ +--- tools/build/v2/tools/common.jam.orig 2009-09-23 16:39:31.000000000 +0400 ++++ tools/build/v2/tools/common.jam 2009-09-23 16:39:33.000000000 +0400 +@@ -765,14 +765,6 @@ result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) : - $(property-set) ] ] ; - -- case <threading> : + $(property-set) ] ] ; + +- case <threading> : - result += [ join-tag $(f:G=) : [ threading-tag $(name) : $(type) -- : $(property-set) ] ] ; -- -- case <runtime> : +- : $(property-set) ] ] ; +- +- case <runtime> : - result += [ join-tag $(f:G=) : [ runtime-tag $(name) : $(type) : -- $(property-set) ] ] ; -- - case <version:*> : - local key = [ MATCH <version:(.*)> : $(f:G) ] ; - local version = [ $(property-set).get <$(key)> ] ; +- $(property-set) ] ] ; +- + case <qt> : + result += [ join-tag $(f:G=) : [ qt-tag $(name) : $(type) : + $(property-set) ] ] ; |