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

[smr at alioth.debian.org]

Author: smr
Date: 2008-11-23 05:22:50 +0000 (Sun, 23 Nov 2008)
New Revision: 14335

Added:
   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
   boost/branches/1.36.0/debian/rules
Log:
Add armel, m68k and sparc to list of arches that cannot use sp_counted_base_sync due to missing __sync functions.

Modified: boost/branches/1.36.0/debian/changelog
===================================================================
--- boost/branches/1.36.0/debian/changelog	2008-11-23 04:57:53 UTC (rev 14334)
+++ boost/branches/1.36.0/debian/changelog	2008-11-23 05:22:50 UTC (rev 14335)
@@ -3,8 +3,15 @@
   * patches/system-error-code.patch: New.  Restore function
     get_posix_category().  Closes: #503917.  Thanks to Deng Xiyue for
     researching the fix.
+  
+  * patches/sp_counted_base.patch: New.  Add armel, m68k, and sparc to
+    list of architectures that cannot use sp_counted_base_sync (they do
+    not have __sync functions).
+  * rules: The above patch means these architectures fall through to
+    sp_counted_base_spin, so we no longer need to specify
+    BOOST_SP_USE_PTHREADS.
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 22 Nov 2008 22:55:04 -0600
+ -- Steve M. Robbins <smr at debian.org>  Sat, 22 Nov 2008 23:18:48 -0600
 
 boost1.36 (1.36.0-8) unstable; urgency=low
 

Modified: boost/branches/1.36.0/debian/patches/series
===================================================================
--- boost/branches/1.36.0/debian/patches/series	2008-11-23 04:57:53 UTC (rev 14334)
+++ boost/branches/1.36.0/debian/patches/series	2008-11-23 05:22:50 UTC (rev 14335)
@@ -17,3 +17,4 @@
 gcc43-path_name_check.patch
 date_time_date_formatting_hpp.patch
 jam-hardening.patch
+sp_counted_base.patch

Added: boost/branches/1.36.0/debian/patches/sp_counted_base.patch
===================================================================
--- boost/branches/1.36.0/debian/patches/sp_counted_base.patch	                        (rev 0)
+++ boost/branches/1.36.0/debian/patches/sp_counted_base.patch	2008-11-23 05:22:50 UTC (rev 14335)
@@ -0,0 +1,11 @@
+--- 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(__armel__) && !defined(__hppa__) && !defined( __hppa ) && !defined(__m68k__) && !defined(__sparc__)
+ # include <boost/detail/sp_counted_base_sync.hpp>
+ 
+ #elif defined(__GNUC__) && ( defined( __sparcv8 ) || defined( __sparcv9 ) )

Modified: boost/branches/1.36.0/debian/rules
===================================================================
--- boost/branches/1.36.0/debian/rules	2008-11-23 04:57:53 UTC (rev 14334)
+++ boost/branches/1.36.0/debian/rules	2008-11-23 05:22:50 UTC (rev 14335)
@@ -130,19 +130,15 @@
 		) \
 	)
 
+TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT ;"
 BUILD_LONG_DOUBLE = yes
 
-TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT ;"
 ifeq ($(DEB_BUILD_ARCH), hppa)
-TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT <compileflags>-mlong-calls <compileflags>-DBOOST_SP_USE_PTHREADS ;"
+TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT <compileflags>-mlong-calls ;"
 BUILD_LONG_DOUBLE = no
-else ifeq ($(DEB_BUILD_ARCH), sparc)
-TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT <compileflags>-DBOOST_SP_USE_PTHREADS ;"
 else ifeq ($(DEB_BUILD_ARCH), arm)
-TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT <compileflags>-DBOOST_SP_USE_PTHREADS ;"
 BUILD_LONG_DOUBLE = no
 else ifeq ($(DEB_BUILD_ARCH), armel)
-TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT <compileflags>-DBOOST_SP_USE_PTHREADS ;"
 BUILD_LONG_DOUBLE = no
 else ifeq ($(DEB_BUILD_ARCH), mips)
 BUILD_LONG_DOUBLE = no