diff options
| author | joerg <joerg@pkgsrc.org> | 2008-09-17 15:04:21 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-09-17 15:04:21 +0000 |
| commit | 63dfb5ba451793208dd43c26c0546100d2a39e2f (patch) | |
| tree | 03588bac9982c11850a703833f32a08b1dad351e | |
| parent | 26bb28fb636c3844ad94cc5054ae94edf724854d (diff) | |
| download | pkgsrc-63dfb5ba451793208dd43c26c0546100d2a39e2f.tar.gz | |
Fix build on DragonFly. From PR 39561.
| -rw-r--r-- | meta-pkgs/boost/distinfo | 4 | ||||
| -rw-r--r-- | meta-pkgs/boost/patches/patch-aq | 26 |
2 files changed, 22 insertions, 8 deletions
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index b2dfbc26993..296c9ba55c6 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2008/09/13 16:14:13 jmmv Exp $ +$NetBSD: distinfo,v 1.16 2008/09/17 15:04:21 joerg Exp $ SHA1 (boost_1_36_0.tar.bz2) = b8f0f5d90b260aff995ef38fad4eee5e73d00810 RMD160 (boost_1_36_0.tar.bz2) = 0ac38ee3c355c22fd5534bc806bf516890e5182d @@ -9,4 +9,4 @@ SHA1 (patch-af) = f0a1fc4b9884663fbe5b9613bc61837b8e6e6af1 SHA1 (patch-ak) = 32785c636ccc9be479db2d40d170f95e77d4e291 SHA1 (patch-am) = 1b49351c5172903956886959859f4fd97fdf060c SHA1 (patch-ap) = 41960933cc1b59b13a3346d31393b1ccd917e147 -SHA1 (patch-aq) = e76dbb67925682a8daa2cc5da2f7f127f8f1c346 +SHA1 (patch-aq) = 490fdf23b2422c75b0cfd3e2035766f4530d2d33 diff --git a/meta-pkgs/boost/patches/patch-aq b/meta-pkgs/boost/patches/patch-aq index d83cf163aae..6cbd9f55d92 100644 --- a/meta-pkgs/boost/patches/patch-aq +++ b/meta-pkgs/boost/patches/patch-aq @@ -1,13 +1,27 @@ -$NetBSD: patch-aq,v 1.1 2008/09/13 16:14:13 jmmv Exp $ - ---- boost/test/impl/execution_monitor.ipp.orig 2007-11-25 11:07:19.000000000 -0700 -+++ boost/test/impl/execution_monitor.ipp -@@ -139,7 +139,7 @@ +--- boost/test/impl/execution_monitor.ipp.orig 2008-09-15 04:30:57 +0300 ++++ boost/test/impl/execution_monitor.ipp 2008-09-16 09:35:04 +0300 +@@ -139,7 +139,7 @@ namespace { void _set_se_translator( voi # define BOOST_TEST_USE_ALT_STACK # endif -# if !defined(__CYGWIN__) && !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)) -+# if !defined(__CYGWIN__) && !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)) && !defined(__NetBSD__) ++# if !defined(__CYGWIN__) && !(defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)) && !defined(__NetBSD__) && !defined(__DragonFly__) # define BOOST_TEST_CATCH_SIGPOLL # endif +@@ -249,6 +249,7 @@ system_signal_exception::report() const + if( !m_sig_info ) + return; // no error actually occur? + ++#if !defined(__DragonFly__) + if( m_sig_info->si_code <= 0 ) { + switch( m_sig_info->si_code ) { + case SI_USER: +@@ -489,6 +490,7 @@ system_signal_exception::report() const + report_error( execution_exception::system_error, "unrecognized signal" ); + } + } ++#endif /* !__DragonFly__ */ + } + + //____________________________________________________________________________// |