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

[Steven Michael Robbins]

Author: smr
Date: 2010-01-12 06:52:10 +0000 (Tue, 12 Jan 2010)
New Revision: 14558

Added:
   boost/trunk/debian/patches/kfreebsd-thread.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Fix build failure on kFreeBSD.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2010-01-12 06:48:31 UTC (rev 14557)
+++ boost/trunk/debian/changelog	2010-01-12 06:52:10 UTC (rev 14558)
@@ -3,7 +3,10 @@
   * patches/boost-graph-printf.patch: New.  Include stdio.h, to define
     fprintf() and stderr.
   
- -- Steve M. Robbins <smr at debian.org>  Tue, 12 Jan 2010 00:47:19 -0600
+  * patches/kfreebsd-thread.patch: New (thanks, Petr Salinger).  Fix
+    checks for __GLIBC__ source so that it builds on GNU/kFreeBSD.  
+  
+ -- Steve M. Robbins <smr at debian.org>  Tue, 12 Jan 2010 00:51:40 -0600
 
 boost1.41 (1.41.0-1) unstable; urgency=low
 

Added: boost/trunk/debian/patches/kfreebsd-thread.patch
===================================================================
--- boost/trunk/debian/patches/kfreebsd-thread.patch	                        (rev 0)
+++ boost/trunk/debian/patches/kfreebsd-thread.patch	2010-01-12 06:52:10 UTC (rev 14558)
@@ -0,0 +1,20 @@
+--- boost1.41-1.41.0.orig/libs/thread/src/pthread/thread.cpp
++++ boost1.41-1.41.0/libs/thread/src/pthread/thread.cpp
+@@ -13,7 +13,7 @@
+ #include <boost/thread/locks.hpp>
+ #include <boost/thread/once.hpp>
+ #include <boost/thread/tss.hpp>
+-#ifdef __linux__
++#ifdef __GLIBC__
+ #include <sys/sysinfo.h>
+ #elif defined(__APPLE__) || defined(__FreeBSD__)
+ #include <sys/types.h>
+@@ -380,7 +380,7 @@
+     {
+ #if defined(PTW32_VERSION) || defined(__hpux)
+         return pthread_num_processors_np();
+-#elif defined(_GNU_SOURCE)
++#elif defined(__GLIBC__)
+         return get_nprocs();
+ #elif defined(__APPLE__) || defined(__FreeBSD__)
+         int count;

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2010-01-12 06:48:31 UTC (rev 14557)
+++ boost/trunk/debian/patches/series	2010-01-12 06:52:10 UTC (rev 14558)
@@ -12,3 +12,4 @@
 hurd-execution_monitor.patch
 mapped_file-header-guard.patch
 boost-graph-printf.patch
+kfreebsd-thread.patch