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

smr at alioth.debian.org smr at alioth.debian.org
Sun Dec 14 21:57:37 UTC 2008 

Author: smr
Date: 2008-12-14 21:57:37 +0000 (Sun, 14 Dec 2008)
New Revision: 14351

Added:
   boost/trunk/debian/patches/kfreebsd-jam.patch
   boost/trunk/debian/patches/sp_counted_base.patch
   boost/trunk/debian/patches/system-error-code.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
   boost/trunk/debian/rules
Log:
Add patches:

    debian/patches/system-error-code.patch
    debian/patches/kfreebsd-jam.patch
    debian/patches/sp_counted_base.patch

With the latter patch, we modify debian/rules to no longer use
BOOST_SP_USE_PTHREADS on architectures arm, armel, and sparc.




Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-12-14 21:32:36 UTC (rev 14350)
+++ boost/trunk/debian/changelog	2008-12-14 21:57:37 UTC (rev 14351)
@@ -1,4 +1,4 @@
-boost1.37 (1.37.0-2) UNRELEASED; urgency=low
+boost1.37 (1.37.0-2) unstable; urgency=low
 
   * control: Add Bcs-Browser and Vcs-Svn information.
 
@@ -16,8 +16,24 @@
   * patches/math-c99.patch: New.  Fix detection of long-double math
     functions such as log1pl() and expm1l().  Upstream changeset 50055.
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 06 Dec 2008 21:16:33 -0600
+  * patches/kfreebsd-jam.patch: New.  Include <unistd.h> for all GLIBC
+    systems; fixes a build failure for kFreeBSD.  Thanks to Petr Salinger
+    for the patch.  Closes: #506736.
 
+  * 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 (and arm, which
+    is already accounted for in sp_counted_base.hpp) 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>  Sun, 14 Dec 2008 15:40:39 -0600
+
 boost1.37 (1.37.0-1) unstable; urgency=low
 
   * New upstream.  Closes: #504475.

Added: boost/trunk/debian/patches/kfreebsd-jam.patch
===================================================================
--- boost/trunk/debian/patches/kfreebsd-jam.patch	                        (rev 0)
+++ boost/trunk/debian/patches/kfreebsd-jam.patch	2008-12-14 21:57:37 UTC (rev 14351)
@@ -0,0 +1,13 @@
+--- boost1.36-1.36.0.orig/tools/jam/src/jam.h
++++ boost1.36-1.36.0/tools/jam/src/jam.h
+@@ -418,6 +418,10 @@
+ # include <stdlib.h>
+ # endif
+ 
++# ifdef __GLIBC__
++# include <unistd.h>
++# endif
++
+ # if !defined(OS_BSDI) && \
+      !defined(OS_FREEBSD) && \
+      !defined(OS_DRAGONFLYBSD) && \

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2008-12-14 21:32:36 UTC (rev 14350)
+++ boost/trunk/debian/patches/series	2008-12-14 21:57:37 UTC (rev 14351)
@@ -1,13 +1,16 @@
 math-c99.patch
 atomic_count.patch
 atomic_count_gcc.patch
+sp_counted_base.patch
 jam-hardening.patch
 endian.patch
 avoid-PATH_MAX.patch
 jam-wall-clean.patch
+kfreebsd-jam.patch
 python2.5-elementtree.patch
 library-naming.patch
 suppress-compiler-warnings.patch
 gcc43-date_time.patch
 gcc43-path_name_check.patch
 date_time_date_formatting_hpp.patch
+system-error-code.patch

Added: boost/trunk/debian/patches/sp_counted_base.patch
===================================================================
--- boost/trunk/debian/patches/sp_counted_base.patch	                        (rev 0)
+++ boost/trunk/debian/patches/sp_counted_base.patch	2008-12-14 21:57:37 UTC (rev 14351)
@@ -0,0 +1,11 @@
+--- boost1.37-1.37.0.orig/boost/detail/sp_counted_base.hpp
++++ boost1.37-1.37.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 ) && ( !defined( __INTEL_COMPILER ) || defined( __ia64__ ) )
++#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && !defined( __armel__ ) && !defined( __hppa ) && !defined( __hppa__ ) && !defined( __m68k__ ) && !defined( __sparc__ ) && ( !defined( __INTEL_COMPILER ) || defined( __ia64__ ) )
+ # include <boost/detail/sp_counted_base_sync.hpp>
+ 
+ #elif defined(__GNUC__) && ( defined( __sparcv9 ) || ( defined( __sparcv8 ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 ) ) )

Added: boost/trunk/debian/patches/system-error-code.patch
===================================================================
--- boost/trunk/debian/patches/system-error-code.patch	                        (rev 0)
+++ boost/trunk/debian/patches/system-error-code.patch	2008-12-14 21:57:37 UTC (rev 14351)
@@ -0,0 +1,26 @@
+Changeset 49717 from Boost SVN.
+Applies to 1.36, 1.37.  Should be fixed upstream post 1.37.
+
+Fixes upstream https://svn.boost.org/trac/boost/ticket/2461
+Debian http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=503917
+
+
+--- boost1.36-1.36.0.orig/boost/system/error_code.hpp
++++ boost1.36-1.36.0/boost/system/error_code.hpp
+@@ -207,6 +207,7 @@
+     
+ # ifndef BOOST_SYSTEM_NO_DEPRECATED
+     //  deprecated synonyms
++    inline const error_category &  get_posix_category() { return get_generic_category(); }
+     static const error_category &  posix_category = get_generic_category();
+     static const error_category &  errno_ecat     = get_generic_category();
+     static const error_category &  native_ecat    = get_system_category();
+@@ -214,7 +215,7 @@
+ 
+     //  class error_condition  -----------------------------------------------//
+ 
+-    //  error_conditions are portable, error_codes are system or lib specific
++    //  error_conditions are portable, error_codes are system or library specific
+ 
+     class error_condition
+     {

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2008-12-14 21:32:36 UTC (rev 14350)
+++ boost/trunk/debian/rules	2008-12-14 21:57:37 UTC (rev 14351)
@@ -131,12 +131,6 @@
 
 ifeq ($(DEB_BUILD_ARCH), hppa)
 TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT <compileflags>-mlong-calls <compileflags>-DBOOST_SP_USE_PTHREADS ;"
-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 ;"
-else ifeq ($(DEB_BUILD_ARCH), armel)
-TOOLSET_CONFIG="using gcc : : : <compileflags>-D_REENTRANT <compileflags>-DBOOST_SP_USE_PTHREADS ;"
 endif
 
 PYTHON_CONFIG1 = "using python : 2.4 : /usr ;"

More information about the pkg-boost-commits mailing list