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

[smr at alioth.debian.org]

Author: smr
Date: 2008-11-15 03:03:59 +0000 (Sat, 15 Nov 2008)
New Revision: 14322

Modified:
   boost/branches/1.36.0/debian/changelog
   boost/branches/1.36.0/debian/patches/add-disable-long-double.patch
   boost/branches/1.36.0/debian/patches/atomic_count.patch
Log:
Tweak patches to fix build failures.

Modified: boost/branches/1.36.0/debian/changelog
===================================================================
--- boost/branches/1.36.0/debian/changelog	2008-11-13 06:53:06 UTC (rev 14321)
+++ boost/branches/1.36.0/debian/changelog	2008-11-15 03:03:59 UTC (rev 14322)
@@ -1,3 +1,13 @@
+boost1.36 (1.36.0-6) unstable; urgency=low
+
+  * patches/atomic_count.patch: Add arm, armel, and hppa to architectures
+    excluded from using atomic_count_sync.
+  
+  * patches/add-disable-long-double.patch: Only install boost_math_c99l
+    and boost_math_tr1l if build-long-double is true.
+
+ -- Steve M. Robbins <smr at debian.org>  Fri, 14 Nov 2008 20:04:17 -0600
+
 boost1.36 (1.36.0-5) unstable; urgency=low
 
   * patches/no-long-double-math.patch: New.  Do not define log1p(long double) if

Modified: boost/branches/1.36.0/debian/patches/add-disable-long-double.patch
===================================================================
--- boost/branches/1.36.0/debian/patches/add-disable-long-double.patch	2008-11-13 06:53:06 UTC (rev 14321)
+++ boost/branches/1.36.0/debian/patches/add-disable-long-double.patch	2008-11-15 03:03:59 UTC (rev 14322)
@@ -43,7 +43,7 @@
  
  lib boost_math_c99 : ../src/tr1/$(C99_SOURCES).cpp
      :         
-@@ -79,11 +94,15 @@
+@@ -79,12 +94,20 @@
   	     <link>shared:<define>BOOST_MATH_TR1_DYN_LINK=1
     ;
  
@@ -58,4 +58,10 @@
 +}
  
  
- boost-install boost_math_c99 boost_math_c99f boost_math_c99l boost_math_tr1 boost_math_tr1f boost_math_tr1l ;
+-boost-install boost_math_c99 boost_math_c99f boost_math_c99l boost_math_tr1 boost_math_tr1f boost_math_tr1l ;
++boost-install boost_math_c99 boost_math_c99f boost_math_tr1 boost_math_tr1f ;
+ 
++if $(build-long-double) = true
++{
++boost-install boost_math_c99l boost_math_tr1l ;
++}

Modified: boost/branches/1.36.0/debian/patches/atomic_count.patch
===================================================================
--- boost/branches/1.36.0/debian/patches/atomic_count.patch	2008-11-13 06:53:06 UTC (rev 14321)
+++ boost/branches/1.36.0/debian/patches/atomic_count.patch	2008-11-15 03:03:59 UTC (rev 14322)
@@ -5,7 +5,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__) 
++#elif defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined(__arm__) && !defined(__armel__) && !defined(__hppa__) && !defined(__m68k__) && !defined(__sparc__) 
  
  #  include <boost/detail/atomic_count_sync.hpp>