[pkg-boost-commits] r14315 - in boost/branches/1.36.0/debian: . patches

[smr at alioth.debian.org]

Author: smr
Date: 2008-11-11 20:50:08 +0000 (Tue, 11 Nov 2008)
New Revision: 14315

Added:
   boost/branches/1.36.0/debian/patches/atomic_count.patch
Removed:
   boost/branches/1.36.0/debian/patches/sp_counted_base.patch
Modified:
   boost/branches/1.36.0/debian/changelog
   boost/branches/1.36.0/debian/patches/series
Log:
Revert previous change: sp_counted_base is the wrong file to patch.
Add patch for atomic_count, instead.  Exclude both sparc and m68k from
using atomic_count_sync.hpp.



Modified: boost/branches/1.36.0/debian/changelog
===================================================================
--- boost/branches/1.36.0/debian/changelog	2008-11-11 07:25:29 UTC (rev 14314)
+++ boost/branches/1.36.0/debian/changelog	2008-11-11 20:50:08 UTC (rev 14315)
@@ -1,11 +1,11 @@
 boost1.36 (1.36.0-4) unstable; urgency=low
 
-  * patches/sp_counted_base.patch: New.  Exclude sparc from
-    sp_counted_base_sync case since the sparc doesn't have
-    __sync_add_and_fetch_4.
+  * patches/atomic_count.patch: New.  Exclude sparc and m68k from atomic_count_sync
+    case since they do not have __sync functions
+    (http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html).
+  
+ -- Steve M. Robbins <smr at debian.org>  Tue, 11 Nov 2008 13:50:55 -0600
 
- -- Steve M. Robbins <smr at debian.org>  Tue, 11 Nov 2008 01:17:12 -0600
-
 boost1.36 (1.36.0-3) unstable; urgency=low
 
   * debian/rules: Include debug symbols in libboost-dbg.  Thanks for Tim

Added: boost/branches/1.36.0/debian/patches/atomic_count.patch
===================================================================
--- boost/branches/1.36.0/debian/patches/atomic_count.patch	                        (rev 0)
+++ boost/branches/1.36.0/debian/patches/atomic_count.patch	2008-11-11 20:50:08 UTC (rev 14315)
@@ -0,0 +1,11 @@
+--- boost1.36-1.36.0.orig/boost/detail/atomic_count.hpp
++++ boost1.36-1.36.0/boost/detail/atomic_count.hpp
+@@ -101,7 +101,7 @@
+ 
+ #  include <boost/detail/atomic_count_win32.hpp>
+ 
+-#elif defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 )
++#elif defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined(__m68k__) && !defined(__sparc__) 
+ 
+ #  include <boost/detail/atomic_count_sync.hpp>
+ 

Modified: boost/branches/1.36.0/debian/patches/series
===================================================================
--- boost/branches/1.36.0/debian/patches/series	2008-11-11 07:25:29 UTC (rev 14314)
+++ boost/branches/1.36.0/debian/patches/series	2008-11-11 20:50:08 UTC (rev 14315)
@@ -1,4 +1,4 @@
-sp_counted_base.patch
+atomic_count.patch
 endian.patch
 avoid-PATH_MAX.patch
 jam-wall-clean.patch

Deleted: boost/branches/1.36.0/debian/patches/sp_counted_base.patch
===================================================================
--- boost/branches/1.36.0/debian/patches/sp_counted_base.patch	2008-11-11 07:25:29 UTC (rev 14314)
+++ boost/branches/1.36.0/debian/patches/sp_counted_base.patch	2008-11-11 20:50:08 UTC (rev 14315)
@@ -1,11 +0,0 @@
---- boost1.36-1.36.0.orig/boost/detail/sp_counted_base.hpp
-+++ boost1.36-1.36.0/boost/detail/sp_counted_base.hpp
-@@ -46,7 +46,7 @@
- #elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc ) )
- # include <boost/detail/sp_counted_base_gcc_ppc.hpp>
- 
--#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && !defined( __hppa )
-+#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && !defined( __hppa ) && !defined( __sparc ) && !defined( __sparc__ )
- # include <boost/detail/sp_counted_base_sync.hpp>
- 
- #elif defined(__GNUC__) && ( defined( __sparcv8 ) || defined( __sparcv9 ) )