[pkg-boost-commits] r14246 - in boost/trunk/debian: . patches

[smr at alioth.debian.org]

Author: smr
Date: 2008-08-03 04:16:41 +0000 (Sun, 03 Aug 2008)
New Revision: 14246

Added:
   boost/trunk/debian/patches/kfreebsd-poll-symbols.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Work around for kFreeBSD defining POLL_ERR and POLL_HUP as same value.  Closes: 492786.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-08-03 02:18:20 UTC (rev 14245)
+++ boost/trunk/debian/changelog	2008-08-03 04:16:41 UTC (rev 14246)
@@ -13,6 +13,9 @@
     sp_counted_base_sync.hpp on ARM and HPPA, as those architectures do
     not support atomic builtin __sync_fetch_and_add.  Closes: #485434.
   
+  * debian/patches/kfreebsd-poll-symbols.patch: New.  Work around kFreeBSD
+    defining POLL_ERR and POLL_HUP as the same value.  Closes: #492786.
+  
   * debian/patches/test-child-exit-t1723.patch: New.  Ignore child process
     if return status is zero (normal); fix for Boost ticket 1723.
   
@@ -23,7 +26,7 @@
   
   * debian/rules: perform parallel builds as per $DEB_BUILD_OPTIONS 
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 02 Aug 2008 20:30:36 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sat, 02 Aug 2008 23:14:24 -0500
 
 boost1.35 (1.35.0-5) unstable; urgency=low
 

Added: boost/trunk/debian/patches/kfreebsd-poll-symbols.patch
===================================================================
--- boost/trunk/debian/patches/kfreebsd-poll-symbols.patch	                        (rev 0)
+++ boost/trunk/debian/patches/kfreebsd-poll-symbols.patch	2008-08-03 04:16:41 UTC (rev 14246)
@@ -0,0 +1,23 @@
+The FreeBSD kernel uses the same value for POLL_ERR and POLL_HUP,
+see http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/sys/signal.h
+
+Fix for BTS #492786.
+Reported upstream as http://svn.boost.org/trac/boost/ticket/2152.
+
+
+--- boost1.35-1.35.0.orig/boost/test/impl/execution_monitor.ipp
++++ boost1.35-1.35.0/boost/test/impl/execution_monitor.ipp
+@@ -465,11 +465,13 @@
+                               "high priority input available; band event %d",
+                               (int)m_sig_info->si_band );
+                 break;
++#if defined(POLL_ERR) && defined(POLL_HUP) && (POLL_ERR - POLL_HUP)
+             case POLL_HUP:
+                 report_error( execution_exception::system_error,
+                               "device disconnected; band event %d",
+                               (int)m_sig_info->si_band );
+                 break;
++#endif
+             }
+             break;
+ 

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2008-08-03 02:18:20 UTC (rev 14245)
+++ boost/trunk/debian/patches/series	2008-08-03 04:16:41 UTC (rev 14246)
@@ -5,5 +5,6 @@
 suppress-compiler-warnings.patch
 serialisation-utility-include.patch
 sp_counted_base.patch
+kfreebsd-poll-symbols.patch
 gcc-4.3.patch
 date_time_date_formatting_hpp.patch