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

Steven Michael Robbins smr at alioth.debian.org
Wed Sep 1 01:26:30 UTC 2010 

Author: smr
Date: 2010-09-01 01:26:29 +0000 (Wed, 01 Sep 2010)
New Revision: 14591

Removed:
   boost/trunk/debian/patches/lambda-include-deps.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/boost-build-pythonid.patch
   boost/trunk/debian/patches/kfreebsd-thread.patch
   boost/trunk/debian/patches/series
Log:
Update for upstream 1.44.  Refresh patches.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2010-09-01 01:24:46 UTC (rev 14590)
+++ boost/trunk/debian/changelog	2010-09-01 01:26:29 UTC (rev 14591)
@@ -1,3 +1,15 @@
+boost1.44 (1.44.0-1) unstable; urgency=low
+
+  * New upstream.
+    - patches/boost-build-pythonid.patch: Modify.  Partially applied upstream.
+    - patches/lambda-include-deps.patch: Remove.  Applied upstream.
+    - patches/kfreebsd-thread.patch: Refresh.
+    - patches/jam-wall-clean.patch: Remove temporarily.
+  
+  * rules: The python build ID now specified using --python-buildid.
+
+ -- Steve M. Robbins <smr at debian.org>  Tue, 31 Aug 2010 20:26:01 -0500
+
 boost1.42 (1.42.0-4) unstable; urgency=low
 
   * rules: Copy "doc" directories to $htmldir with --parents option so

Modified: boost/trunk/debian/patches/boost-build-pythonid.patch
===================================================================
--- boost/trunk/debian/patches/boost-build-pythonid.patch	2010-09-01 01:24:46 UTC (rev 14590)
+++ boost/trunk/debian/patches/boost-build-pythonid.patch	2010-09-01 01:26:29 UTC (rev 14591)
@@ -1,66 +1,13 @@
 Patch from Gaudenz Steinlin <gaudenz at debian.org>
 Debian bug: #552014
 Reported upstream: https://svn.boost.org/trac/boost/ticket/3544
-Fixed upstream: 2010-02-28 (post Boost 1.42)
 
-Add --xpythonid parameter to the build system to only add an identification 
-to Python libraries. The existing --buildid parameter adds an id to all 
-libraries and leads to uneccessary duplication of libraries if only the 
-Python version for the build is different.
+The upstream bug was supposed to have been fixed in Changeset 59987
+https://svn.boost.org/trac/boost/changeset/59987 on 2010-02-28 but
+Boost 1.44 was released with part of the patch missing.  This 
+abridged patch is that missing piece: add the tag to mpi python
+libraries.
 
---- boost_1_41_0.orig/Jamroot
-+++ boost_1_41_0/Jamroot
-@@ -342,6 +342,12 @@
-     constant BUILD_ID : [ regex.replace $(build-id) "[*\\/:.\"\' ]" "_" ] ;
- }
- 
-+# Python build id (only for Python libraries)
-+local python-id = [ MATCH "^--xpythonid=(.*)" : [ modules.peek : ARGV ] ] ;
-+if $(python-id)
-+{
-+    constant PYTHON_ID : [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
-+}
- 
- # This rule is called by Boost.Build to determine the name of target. We use it
- # to encode the build variant, compiler name and boost version in the target
---- boost_1_41_0.orig/libs/python/build/Jamfile.v2
-+++ boost_1_41_0/libs/python/build/Jamfile.v2
-@@ -3,6 +3,7 @@
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- 
- import os ;
-+import indirect ;
- import modules ;
- import feature ;
- 
-@@ -41,8 +42,27 @@
- 
- project boost/python
-   : source-location ../src
-+  : requirements
-+    -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-+    <tag>@$(__name__).tag
-   ;
- 
-+rule tag ( name : type ? : property-set )
-+{
-+    local result = $(name) ;
-+    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
-+    {
-+        if $(name) = boost_python && $(PYTHON_ID)
-+        {
-+            result = $(result)-$(PYTHON_ID) ;
-+        }
-+    }
-+    
-+    # forward to the boost tagging rule
-+    return  [ indirect.call $(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag 
-+                $(result) : $(type) : $(property-set) ] ;
-+}
-+
- rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
- rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
- 
 --- boost_1_41_0.orig/libs/mpi/build/Jamfile.v2
 +++ boost_1_41_0/libs/mpi/build/Jamfile.v2
 @@ -9,6 +9,7 @@

Modified: boost/trunk/debian/patches/kfreebsd-thread.patch
===================================================================
--- boost/trunk/debian/patches/kfreebsd-thread.patch	2010-09-01 01:24:46 UTC (rev 14590)
+++ boost/trunk/debian/patches/kfreebsd-thread.patch	2010-09-01 01:26:29 UTC (rev 14591)
@@ -1,20 +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>
+--- boost1.44-1.44.0.orig/libs/thread/src/pthread/thread.cpp
++++ boost1.44-1.44.0/libs/thread/src/pthread/thread.cpp
+@@ -14,7 +14,7 @@
  #include <boost/thread/once.hpp>
  #include <boost/thread/tss.hpp>
+ #include <boost/throw_exception.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();
+@@ -382,7 +382,7 @@
+ #elif defined(BOOST_HAS_UNISTD_H) && defined(_SC_NPROCESSORS_ONLN)
+         int const count=sysconf(_SC_NPROCESSORS_ONLN);
+         return (count>0)?count:0;
 -#elif defined(_GNU_SOURCE)
 +#elif defined(__GLIBC__)
          return get_nprocs();
- #elif defined(__APPLE__) || defined(__FreeBSD__)
-         int count;
+ #else
+         return 0;

Deleted: boost/trunk/debian/patches/lambda-include-deps.patch
===================================================================
--- boost/trunk/debian/patches/lambda-include-deps.patch	2010-09-01 01:24:46 UTC (rev 14590)
+++ boost/trunk/debian/patches/lambda-include-deps.patch	2010-09-01 01:26:29 UTC (rev 14591)
@@ -1,42 +0,0 @@
---- /dev/null
-+++ boost1.42-1.42.0/trunk/boost/lambda/casts.hpp
-@@ -0,0 +1,4 @@
-+#include "boost/lambda/core.hpp"
-+
-+template<class Act, class Args>
-+struct return_type_N;
---- /dev/null
-+++ boost1.42-1.42.0/trunk/boost/lambda/construct.hpp
-@@ -0,0 +1,3 @@
-+
-+#include "boost/type_traits/remove_cv.hpp"
-+#include "boost/type_traits/is_pointer.hpp"
---- /dev/null
-+++ boost1.42-1.42.0/trunk/boost/lambda/detail/lambda_functor_base.hpp
-@@ -0,0 +1,6 @@
-+
-+#include "boost/type_traits/add_reference.hpp"
-+#include "boost/type_traits/add_const.hpp"
-+#include "boost/type_traits/remove_const.hpp"
-+#include "boost/lambda/detail/lambda_fwd.hpp"
-+#include "boost/lambda/detail/lambda_traits.hpp"
---- /dev/null
-+++ boost1.42-1.42.0/trunk/boost/lambda/detail/lambda_traits.hpp
-@@ -0,0 +1 @@
-+#include "boost/tuple/tuple.hpp"
---- /dev/null
-+++ boost1.42-1.42.0/trunk/boost/lambda/exceptions.hpp
-@@ -0,0 +1 @@
-+#include "boost/lambda/core.hpp"
---- boost1.42-1.42.0.orig/boost/lambda/construct.hpp
-+++ boost1.42-1.42.0/boost/lambda/construct.hpp
-@@ -14,6 +14,9 @@
- #if !defined(BOOST_LAMBDA_CONSTRUCT_HPP)
- #define BOOST_LAMBDA_CONSTRUCT_HPP
- 
-+#include "boost/type_traits/remove_cv.hpp" 
-+#include "boost/type_traits/is_pointer.hpp"
-+
- namespace boost { 
- namespace lambda {
- 

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2010-09-01 01:24:46 UTC (rev 14590)
+++ boost/trunk/debian/patches/series	2010-09-01 01:26:29 UTC (rev 14591)
@@ -4,11 +4,9 @@
 kfreebsd-jam.patch
 python2.5-elementtree.patch
 date_time_date_formatting_hpp.patch
-jam-wall-clean.patch
 sh4.patch
 boost-build-pythonid.patch
 hurd-ellint_rd.patch
 hurd-execution_monitor.patch
 kfreebsd-thread.patch
-lambda-include-deps.patch
 fusion-name-qual.patch

More information about the pkg-boost-commits mailing list