diff -pruN 1.41.0-3/boost/smart_ptr/detail/spinlock_gcc_arm.hpp 1.41.0-3ubuntu2/boost/smart_ptr/detail/spinlock_gcc_arm.hpp --- 1.41.0-3/boost/smart_ptr/detail/spinlock_gcc_arm.hpp 2009-03-02 16:22:16.000000000 +0000 +++ 1.41.0-3ubuntu2/boost/smart_ptr/detail/spinlock_gcc_arm.hpp 2010-02-05 05:42:08.000000000 +0000 @@ -29,12 +29,15 @@ public: { int r; +#ifdef G_ATOMIC_ARM_USE_GCC_INTRINSICS + r = __sync_lock_test_set(&v_, 1); +#else __asm__ __volatile__( "swp %0, %1, [%2]": "=&r"( r ): // outputs "r"( 1 ), "r"( &v_ ): // inputs "memory", "cc" ); - +#endif return r == 0; } diff -pruN 1.41.0-3/bootstrap.log 1.41.0-3ubuntu2/bootstrap.log --- 1.41.0-3/bootstrap.log 1970-01-01 01:00:00.000000000 +0100 +++ 1.41.0-3ubuntu2/bootstrap.log 2010-02-05 05:42:08.000000000 +0000 @@ -0,0 +1,20 @@ +### +### Using 'gcc' toolset. +### +rm -rf bootstrap +mkdir bootstrap +gcc -o bootstrap/jam0 command.c compile.c debug.c expand.c glob.c hash.c hdrmacro.c headers.c jam.c jambase.c jamgram.c lists.c make.c make1.c newstr.c option.c output.c parse.c pathunix.c pathvms.c regexp.c rules.c scan.c search.c subst.c timestamp.c variable.c modules.c strings.c filesys.c builtins.c pwd.c class.c native.c w32_getreg.c modules/set.c modules/path.c modules/regex.c modules/property-set.c modules/sequence.c modules/order.c execunix.c fileunix.c +./bootstrap/jam0 -f build.jam --toolset=gcc --toolset-root= clean +...found 1 target... +...updating 1 target... +...updated 1 target... +./bootstrap/jam0 -f build.jam --toolset=gcc --toolset-root= +...found 47 targets... +...updating 2 targets... +[MKDIR] bin.linuxx86 +[COMPILE] bin.linuxx86/bjam +hash.c: In function 'hashstat': +hash.c:458: warning: ISO C90 does not support the 'z' gnu_printf length modifier +hcache.c: In function 'write_netstring': +hcache.c:169: warning: ISO C90 does not support the 'z' gnu_printf length modifier +...updated 2 targets... diff -pruN 1.41.0-3/debian/changelog 1.41.0-3ubuntu2/debian/changelog --- 1.41.0-3/debian/changelog 2010-01-18 04:17:39.000000000 +0000 +++ 1.41.0-3ubuntu2/debian/changelog 2010-02-05 02:04:27.000000000 +0000 @@ -1,3 +1,20 @@ +boost1.41 (1.41.0-3ubuntu2) lucid; urgency=low + + * Enable gcc atomic intrinsics in rules for arm spinlock (LP: #513721) + + -- David Sugar Wed, 03 Feb 2010 14:42:46 -0500 + +boost1.41 (1.41.0-3ubuntu1) lucid; urgency=low + + * Merge with Debian; remaining changes: + - Drop libboost-mpi from the package: nothing uses this, and we don't want + to pull all of the mpi packages into main. + - Drop the new libboost-graph-parallel completely - it's failing to build + because it depends on libboost-mpi. + * Enable GraphML support. + + -- Matthias Klose Wed, 20 Jan 2010 09:58:14 +0100 + boost1.41 (1.41.0-3) unstable; urgency=low * patches/date_time_date_formatting_hpp.patch: Change @@ -39,6 +56,34 @@ boost1.41 (1.41.0-1) unstable; urgency=l -- Steve M. Robbins Sun, 03 Jan 2010 20:46:58 -0600 +boost1.40 (1.40.0-4ubuntu2) lucid; urgency=low + + * Drop the new libboost-graph-parallel completely - it's failing to build + because it depends on libboost-mpi. + + -- Steve Langasek Fri, 11 Dec 2009 18:19:25 +0000 + +boost1.40 (1.40.0-4ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + * Drop libboost-mpi from the package: nothing uses this, and we don't want + to pull all of the mpi packages into main. + * Update for Lucid Python versions (2.6 instead of 2.4/2.5) + + debian/control: Update XS-Python-Version + + debian/rules: Update python version rules + + debian/rtupdate: Update for Python 2.6 + * debian/patches/gcc-4.4.patch: + + Patch from upstream SVN to fix FTBFS with gcc 4.4. + See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550300 + * Drop libboost-graph-parallel1.40-dev and libboost-graph-parallel1.40 for + now + - The libboost-graph-parallel .so is not being generated for unknown + reasons and so causes the package to FTBFS + - Nothing currently in the archive uses it, so it's not essential now + - This needs fixing before release + + -- Scott Kitterman Wed, 09 Dec 2009 23:55:29 -0500 + boost1.40 (1.40.0-4) unstable; urgency=low * rtupdate: Don't die if link target doesn't exist. Update of @@ -74,6 +119,33 @@ boost1.40 (1.40.0-3) unstable; urgency=l -- Steve M. Robbins Sat, 14 Nov 2009 22:44:30 -0600 +boost1.40 (1.40.0-2ubuntu3) lucid; urgency=low + + * Drop libboost-mpi from the package: nothing uses this, and we don't want + to pull all of the mpi packages into main. + + -- Steve Langasek Tue, 01 Dec 2009 06:07:41 +0000 + +boost1.40 (1.40.0-2ubuntu2) karmic; urgency=low + + * debian/rules: + + Only explicitely list non-standard Python version, fixes + FTBFS for real now. + + -- Sebastian Dröge Tue, 20 Oct 2009 21:03:02 +0200 + +boost1.40 (1.40.0-2ubuntu1) karmic; urgency=low + + * Update for Karmic Python versions (2.5/2.6 instead of 2.4/2.5) + + debian/control: Update XS-Python-Version + + debian/rules: Update python version rules + + debian/rtupdate: Update for Python 2.6 + * debian/patches/gcc-4.4.patch: + + Patch from upstream SVN to fix FTBFS with gcc 4.4. + See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550300 + + -- Sebastian Dröge Tue, 20 Oct 2009 11:26:50 +0200 + boost1.40 (1.40.0-2) unstable; urgency=low * rules: diff -pruN 1.41.0-3/debian/control 1.41.0-3ubuntu2/debian/control --- 1.41.0-3/debian/control 2010-01-04 02:25:46.000000000 +0000 +++ 1.41.0-3ubuntu2/debian/control 2010-01-20 09:49:25.000000000 +0000 @@ -2,9 +2,10 @@ Source: boost1.41 Homepage: http://www.boost.org/ Section: libs Priority: optional -Maintainer: Debian Boost Team +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Boost Team Uploaders: Steve M. Robbins , Domenico Andreoli -Build-Depends: debhelper (>= 7), bison, flex, docbook-to-man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu-dev, python-all-dev, python-support (>= 0.6), mpi-default-dev +Build-Depends: debhelper (>= 7), bison, flex, docbook-to-man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu-dev, python-all-dev, python-support (>= 0.6), libexpat1-dev Build-Conflicts: boost-build, libopenmpi-dev (= 1.3.2-2) XS-Python-Version: >= 2.4 Vcs-Browser: http://svn.debian.org/wsvn/pkg-boost/boost/trunk/ @@ -27,7 +28,7 @@ Package: libboost1.41-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, ${shlibs:Depends}, libstdc++6-4.4-dev | libstdc++-dev -Suggests: libboost1.41-doc, libboost-date-time1.41-dev, libboost-filesystem1.41-dev, libboost-graph-parallel1.41-dev, libboost-graph1.41-dev, libboost-iostreams1.41-dev, libboost-math1.41-dev, libboost-mpi1.41-dev, libboost-program-options1.41-dev, libboost-python1.41-dev, libboost-regex1.41-dev, libboost-serialization1.41-dev, libboost-signals1.41-dev, libboost-system1.41-dev, libboost-test1.41-dev, libboost-thread1.41-dev, libboost-wave1.41-dev, xsltproc, doxygen, docbook-xml (>= 4.2), docbook-xsl (>= 1.73.2), default-jdk (>= 1.4), fop (>= 0.94) +Suggests: libboost1.41-doc, libboost-date-time1.41-dev, libboost-filesystem1.41-dev, libboost-graph1.41-dev, libboost-iostreams1.41-dev, libboost-math1.41-dev, libboost-program-options1.41-dev, libboost-python1.41-dev, libboost-regex1.41-dev, libboost-serialization1.41-dev, libboost-signals1.41-dev, libboost-system1.41-dev, libboost-test1.41-dev, libboost-thread1.41-dev, libboost-wave1.41-dev, xsltproc, doxygen, docbook-xml (>= 4.2), docbook-xsl (>= 1.73.2), default-jdk (>= 1.4), fop (>= 0.94) Conflicts: bcp, libboost-dev (<< 1.35.0), libboost1.35-dev, @@ -68,7 +69,7 @@ Description: Boost C++ Libraries develop boostbook and quickbook. . For the following subprojects separate packages exist: date-time, - filesystem, graph, iostreams, math, mpi, program_options, python, + filesystem, graph, iostreams, math, program_options, python, regex, serialization, signals, system, test, thread, and wave. Package: libboost1.41-all-dev @@ -79,11 +80,8 @@ Depends: ${misc:Depends}, libboost-date-time1.41-dev, libboost-filesystem1.41-dev, libboost-graph1.41-dev, - libboost-graph-parallel1.41-dev, libboost-iostreams1.41-dev, libboost-math1.41-dev, - libboost-mpi1.41-dev, - libboost-mpi-python1.41-dev, libboost-program-options1.41-dev, libboost-python1.41-dev, libboost-regex1.41-dev, @@ -204,39 +202,6 @@ Description: generic graph components an standardized generic interface for traversing graphs is of utmost importance to encourage reuse of graph algorithms and data structures. -Package: libboost-graph-parallel1.41.0 -Homepage: http://www.boost.org/libs/graph_parallel/ -Architecture: any -Section: libs -Depends: ${misc:Depends}, ${shlibs:Depends} -Suggests: graphviz -Description: generic graph components and algorithms in C++ - This package forms part of the Boost C++ Libraries collection. - . - The Parallel Boost Graph Library is an extension to the Boost Graph Library - (BGL) for parallel and distributed computing. It offers distributed graphs - and graph algorithms to exploit coarse-grained parallelism along with - parallel algorithms that exploit fine-grained parallelism, while retaining - the same interfaces as the (sequential) BGL. Code written using the sequential - BGL should be easy to parallelize with the parallel BGL. - -Package: libboost-graph-parallel1.41-dev -Homepage: http://www.boost.org/libs/graph_parallel/ -Architecture: any -Section: libdevel -Depends: ${misc:Depends}, libboost1.41-dev (= ${binary:Version}), libboost-serialization1.41-dev (= ${binary:Version}), libboost-test1.41-dev (= ${binary:Version}) -Conflicts: libboost-graph-parallel1.40-dev -Recommends: libboost-graph-parallel1.41.0 (= ${binary:Version}) -Description: generic graph components and algorithms in C++ - This package forms part of the Boost C++ Libraries collection. - . - The Parallel Boost Graph Library is an extension to the Boost Graph Library - (BGL) for parallel and distributed computing. It offers distributed graphs - and graph algorithms to exploit coarse-grained parallelism along with - parallel algorithms that exploit fine-grained parallelism, while retaining - the same interfaces as the (sequential) BGL. Code written using the sequential - BGL should be easy to parallelize with the parallel BGL. - Package: libboost-iostreams1.41.0 Homepage: http://www.boost.org/libs/iostreams/ Architecture: any @@ -301,70 +266,6 @@ Description: Boost.Math Library developm * Implementation Toolkit: Provides many of the tools required to implement mathematical special functions. -Package: libboost-mpi1.41.0 -Homepage: http://www.boost.org/doc/html/mpi.html -Architecture: any -Section: libs -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: C++ interface to the Message Passing Interface (MPI) - This package forms part of the Boost C++ Libraries collection. - . - The Boost.MPI library provides a C++ interface to MPI that - supports modern C++ development styles, including complete support for - user-defined data types and C++ Standard Library types, arbitrary function - objects for collective algorithms, and the use of modern C++ library - techniques to maintain maximal efficiency. - -Package: libboost-mpi1.41-dev -Homepage: http://www.boost.org/doc/html/mpi.html -Architecture: any -Section: libdevel -Depends: ${misc:Depends}, libboost1.41-dev (= ${binary:Version}), libboost-serialization1.41-dev (= ${binary:Version}), libboost-mpi1.41.0 (= ${binary:Version}), mpi-default-dev -Suggests: libboost-graph1.41-dev -Conflicts: libboost-mpi1.37-dev, libboost-mpi1.38-dev, libboost-mpi1.39-dev, libboost-mpi1.40-dev -Description: C++ interface to the Message Passing Interface (MPI) - This package forms part of the Boost C++ Libraries collection. - . - The Boost.MPI library provides a C++ interface to MPI that - supports modern C++ development styles, including complete support for - user-defined data types and C++ Standard Library types, arbitrary function - objects for collective algorithms, and the use of modern C++ library - techniques to maintain maximal efficiency. - -Package: libboost-mpi-python1.41.0 -Homepage: http://www.boost.org/doc/html/mpi/python.html -Architecture: any -Section: python -Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends} -Conflicts: libboost-mpi-python1.40.0 -Description: C++ interface to the Message Passing Interface (MPI), Python Bindings - This package forms part of the Boost C++ Libraries collection. - . - The Boost.MPI library provides a C++ interface to MPI that - supports modern C++ development styles, including complete support for - user-defined data types and C++ Standard Library types, arbitrary function - objects for collective algorithms, and the use of modern C++ library - techniques to maintain maximal efficiency. - . - This package provides Python Bindings to the C++ interface. - -Package: libboost-mpi-python1.41-dev -Homepage: http://www.boost.org/doc/html/mpi/python.html -Architecture: any -Section: libdevel -Depends: ${misc:Depends}, libboost-mpi1.41-dev (= ${binary:Version}), libboost-mpi-python1.41.0 (= ${binary:Version}) -Conflicts: libboost-mpi-python1.40-dev -Description: C++ interface to the Message Passing Interface (MPI), Python Bindings - This package forms part of the Boost C++ Libraries collection. - . - The Boost.MPI library provides a C++ interface to MPI that - supports modern C++ development styles, including complete support for - user-defined data types and C++ Standard Library types, arbitrary function - objects for collective algorithms, and the use of modern C++ library - techniques to maintain maximal efficiency. - . - This package provides Python Bindings to the C++ interface. - Package: libboost-program-options1.41.0 Homepage: http://www.boost.org/libs/program_options/ Architecture: any diff -pruN 1.41.0-3/debian/patches/debian-changes-1.41.0-3ubuntu1 1.41.0-3ubuntu2/debian/patches/debian-changes-1.41.0-3ubuntu1 --- 1.41.0-3/debian/patches/debian-changes-1.41.0-3ubuntu1 1970-01-01 01:00:00.000000000 +0100 +++ 1.41.0-3ubuntu2/debian/patches/debian-changes-1.41.0-3ubuntu1 2010-01-20 10:49:45.000000000 +0000 @@ -0,0 +1,89 @@ +Description: Upstream changes introduced in version 1.41.0-3ubuntu1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + boost1.41 (1.41.0-3ubuntu1) lucid; urgency=low + . + * Merge with Debian; remaining changes: + - Drop libboost-mpi from the package: nothing uses this, and we don't want + to pull all of the mpi packages into main. + - Drop the new libboost-graph-parallel completely - it's failing to build + because it depends on libboost-mpi. + * Enable GraphML support. + . + The person named in the Author field signed this changelog entry. +Author: Matthias Klose + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Forwarded: +Reviewed-By: +Last-Update: + +--- /dev/null ++++ boost1.41-1.41.0/project-config.jam +@@ -0,0 +1,34 @@ ++# Boost.Build Configuration ++# Automatically generated by bootstrap.sh ++ ++import option ; ++import feature ; ++ ++# Compiler configuration. This definition will be used unless ++# you already have defined some toolsets in your user-config.jam ++# file. ++if ! gcc in [ feature.values ] ++{ ++ using gcc ; ++} ++ ++project : default-build gcc ; ++ ++# Python configuration ++using python : 2.6 : /usr ; ++ ++path-constant ICU_PATH : /usr ; ++ ++ ++# List of --with- and --without- ++# options. If left empty, all libraries will be built. ++# Options specified on the command line completely ++# override this variable. ++libraries = ; ++ ++# These settings are equivivalent to corresponding command-line ++# options. ++option.set prefix : /scratch/packages/tmp/merges/boost1.41-1.41.0/debian/tmp/usr ; ++option.set exec-prefix : /scratch/packages/tmp/merges/boost1.41-1.41.0/debian/tmp/usr ; ++option.set libdir : /scratch/packages/tmp/merges/boost1.41-1.41.0/debian/tmp/usr/lib ; ++option.set includedir : /scratch/packages/tmp/merges/boost1.41-1.41.0/debian/tmp/usr/include ; +--- /dev/null ++++ boost1.41-1.41.0/bootstrap.log +@@ -0,0 +1,20 @@ ++### ++### Using 'gcc' toolset. ++### ++rm -rf bootstrap ++mkdir bootstrap ++gcc -o bootstrap/jam0 command.c compile.c debug.c expand.c glob.c hash.c hdrmacro.c headers.c jam.c jambase.c jamgram.c lists.c make.c make1.c newstr.c option.c output.c parse.c pathunix.c pathvms.c regexp.c rules.c scan.c search.c subst.c timestamp.c variable.c modules.c strings.c filesys.c builtins.c pwd.c class.c native.c w32_getreg.c modules/set.c modules/path.c modules/regex.c modules/property-set.c modules/sequence.c modules/order.c execunix.c fileunix.c ++./bootstrap/jam0 -f build.jam --toolset=gcc --toolset-root= clean ++...found 1 target... ++...updating 1 target... ++...updated 1 target... ++./bootstrap/jam0 -f build.jam --toolset=gcc --toolset-root= ++...found 47 targets... ++...updating 2 targets... ++[MKDIR] bin.linuxx86 ++[COMPILE] bin.linuxx86/bjam ++hash.c: In function 'hashstat': ++hash.c:458: warning: ISO C90 does not support the 'z' gnu_printf length modifier ++hcache.c: In function 'write_netstring': ++hcache.c:169: warning: ISO C90 does not support the 'z' gnu_printf length modifier ++...updated 2 targets... diff -pruN 1.41.0-3/debian/patches/.dpkg-source-applied 1.41.0-3ubuntu2/debian/patches/.dpkg-source-applied --- 1.41.0-3/debian/patches/.dpkg-source-applied 2010-02-05 05:49:38.000000000 +0000 +++ 1.41.0-3ubuntu2/debian/patches/.dpkg-source-applied 2010-02-05 05:42:08.000000000 +0000 @@ -13,3 +13,5 @@ hurd-execution_monitor.patch mapped_file-header-guard.patch boost-graph-printf.patch kfreebsd-thread.patch +debian-changes-1.41.0-3ubuntu1 +gcc-intrinsics-nocmake.patch diff -pruN 1.41.0-3/debian/patches/gcc-intrinsics-nocmake.patch 1.41.0-3ubuntu2/debian/patches/gcc-intrinsics-nocmake.patch --- 1.41.0-3/debian/patches/gcc-intrinsics-nocmake.patch 1970-01-01 01:00:00.000000000 +0100 +++ 1.41.0-3ubuntu2/debian/patches/gcc-intrinsics-nocmake.patch 2010-02-05 02:04:27.000000000 +0000 @@ -0,0 +1,21 @@ +Index: boost1.41-1.41.0/boost/smart_ptr/detail/spinlock_gcc_arm.hpp +=================================================================== +--- boost1.41-1.41.0.orig/boost/smart_ptr/detail/spinlock_gcc_arm.hpp 2010-02-03 14:39:18.238127376 -0500 ++++ boost1.41-1.41.0/boost/smart_ptr/detail/spinlock_gcc_arm.hpp 2010-02-03 14:39:57.668131251 -0500 +@@ -29,12 +29,15 @@ + { + int r; + ++#ifdef G_ATOMIC_ARM_USE_GCC_INTRINSICS ++ r = __sync_lock_test_set(&v_, 1); ++#else + __asm__ __volatile__( + "swp %0, %1, [%2]": + "=&r"( r ): // outputs + "r"( 1 ), "r"( &v_ ): // inputs + "memory", "cc" ); +- ++#endif + return r == 0; + } + diff -pruN 1.41.0-3/debian/patches/series 1.41.0-3ubuntu2/debian/patches/series --- 1.41.0-3/debian/patches/series 2010-01-12 06:49:48.000000000 +0000 +++ 1.41.0-3ubuntu2/debian/patches/series 2010-02-05 02:04:27.000000000 +0000 @@ -13,3 +13,5 @@ hurd-execution_monitor.patch mapped_file-header-guard.patch boost-graph-printf.patch kfreebsd-thread.patch +debian-changes-1.41.0-3ubuntu1 +gcc-intrinsics-nocmake.patch diff -pruN 1.41.0-3/debian/rtupdate 1.41.0-3ubuntu2/debian/rtupdate --- 1.41.0-3/debian/rtupdate 2009-12-15 04:51:25.000000000 +0000 +++ 1.41.0-3ubuntu2/debian/rtupdate 2010-01-20 09:49:25.000000000 +0000 @@ -14,7 +14,7 @@ update_linklibs() { suf=$2 cd /usr/lib - for base in libboost_python libboost_mpi_python; do + for base in libboost_python; do target=${base}-${py}.${suf} link=${base}.${suf} test -e $target && ln -s -f $target $link || rm -f $link @@ -27,7 +27,6 @@ remove_linklibs() { cd /usr/lib for thread in "" -mt; do rm -f libboost_python${thread}.${suf} - rm -f libboost_mpi_python${thread}.${suf} done } diff -pruN 1.41.0-3/debian/rules 1.41.0-3ubuntu2/debian/rules --- 1.41.0-3/debian/rules 2010-01-04 03:12:11.000000000 +0000 +++ 1.41.0-3ubuntu2/debian/rules 2010-02-05 02:04:28.000000000 +0000 @@ -14,8 +14,7 @@ SOVERSION = 1.41.0 SHLIBS_VERSION = (>= 1.41.0-1) # Boost libraries for which we want separate packages -boost_libs := date-time filesystem graph-parallel graph iostreams math \ - mpi mpi-python \ +boost_libs := date-time filesystem graph iostreams math \ program-options python regex serialization signals system test \ thread wave @@ -124,6 +123,7 @@ BUILD_LONG_DOUBLE = no else ifeq ($(DEB_BUILD_ARCH), arm) BUILD_LONG_DOUBLE = no else ifeq ($(DEB_BUILD_ARCH), armel) +TOOLSET_CONFIG="using gcc : : : -D_REENTRANT -DG_ATOMIC_ARM_USE_GCC_INTRINSICS ;" BUILD_LONG_DOUBLE = no else ifeq ($(DEB_BUILD_ARCH), mips) BUILD_LONG_DOUBLE = no @@ -139,7 +139,8 @@ else JAM_OPT += --disable-long-double endif -MPI_CONFIG = "using mpi ;" +export EXPAT_INCLUDE = /usr/include +export EXPAT_LIBPATH = /usr/lib exampledir = debian/libboost$(PKGVERSION)-doc/usr/share/doc/libboost$(PKGVERSION)-doc/examples htmldir = debian/libboost$(PKGVERSION)-doc/usr/share/doc/libboost$(PKGVERSION)-doc/HTML @@ -154,7 +155,6 @@ $(bjam): user-config.jam: echo $(TOOLSET_CONFIG) > $@ - echo $(MPI_CONFIG) >> $@ for pyver in $(filter-out $(shell pyversions -dv),$(shell pyversions -rv)); do \ echo "using python : $$pyver : /usr ;" >> $@; \ done @@ -163,12 +163,11 @@ build: build-stamp build-stamp: $(bjam) user-config.jam dh_testdir - $(JAM) --without-python + $(JAM) --without-python --without-mpi for pyver in $(shell pyversions -rv); do \ pyid=$$(echo $$pyver | tr -d .); \ - echo "Building Boost.Python for python version $pyver"; \ - $(JAM) --with-python --with-mpi --xpythonid=py$$pyid python=$$pyver; \ - mv stage/lib/mpi.so stage/lib/mpi-py$$pyid.so; \ + echo "Building Boost.Python for python version $$pyver"; \ + $(JAM) --with-python --xpythonid=py$$pyid python=$$pyver; \ done cd tools/bcp && $(JAM) @@ -221,16 +220,14 @@ install: build clean-debhelper $(filtere @$(call cp_debhelper,libboost-dev,libboost$(PKGVERSION)-dev) @$(call cp_debhelper,libboost-doc,libboost$(PKGVERSION)-doc) @$(call cp_debhelper,libboost-python-dev,libboost-python$(PKGVERSION)-dev) - @$(call cp_debhelper,libboost-mpi-python-dev,libboost-mpi-python$(PKGVERSION)-dev) - $(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --without-python + $(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --without-python --without-mpi for pyver in $(shell pyversions -rv); do \ pyid=`echo $$pyver | tr -d .`; \ - $(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --with-python --with-mpi --xpythonid=py$$pyid python=$$pyver; \ + $(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --with-python --xpythonid=py$$pyid python=$$pyver; \ done install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate - install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-mpi-python$(PKGVERSION)-dev.rtupdate find debian/tmp/usr/include -type f | xargs chmod 644 find debian/tmp -name .cvsignore | xargs rm -f @@ -274,17 +271,6 @@ install: build clean-debhelper $(filtere - # package libboost-mpi-python$(SOVERSION) - dh_install -plibboost-mpi-python$(SOVERSION) - for pyver in $(shell pyversions -rv); do \ - pyid=`echo $$pyver | tr -d .`; \ - dh_install -plibboost-mpi-python$(SOVERSION) libs/mpi/build/__init__.py usr/lib/python$$pyver/site-packages/boost; \ - dh_installdirs -plibboost-mpi-python$(SOVERSION) usr/lib/python$$pyver/site-packages/boost; \ - cp stage/lib/mpi-py$$pyid.so debian/libboost-mpi-python$(SOVERSION)/usr/lib/python$$pyver/site-packages/boost/mpi.so; \ - done - # package libboost-mpi-python$(PKGVERSION)-dev - dh_install -plibboost-python$(PKGVERSION)-dev --autodest \ - debian/tmp/usr/share/python/runtime.d/libboost-mpi-python$(PKGVERSION)-dev.rtupdate # package libboost-python$(PKGVERSION)-dev dh_install -plibboost-python$(PKGVERSION)-dev --autodest \ debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate diff -pruN 1.41.0-3/.pc/applied-patches 1.41.0-3ubuntu2/.pc/applied-patches --- 1.41.0-3/.pc/applied-patches 2010-02-05 05:49:38.000000000 +0000 +++ 1.41.0-3ubuntu2/.pc/applied-patches 2010-02-05 05:42:08.000000000 +0000 @@ -13,3 +13,5 @@ hurd-execution_monitor.patch mapped_file-header-guard.patch boost-graph-printf.patch kfreebsd-thread.patch +debian-changes-1.41.0-3ubuntu1 +gcc-intrinsics-nocmake.patch diff -pruN 1.41.0-3/.pc/gcc-intrinsics-nocmake.patch/boost/smart_ptr/detail/spinlock_gcc_arm.hpp 1.41.0-3ubuntu2/.pc/gcc-intrinsics-nocmake.patch/boost/smart_ptr/detail/spinlock_gcc_arm.hpp --- 1.41.0-3/.pc/gcc-intrinsics-nocmake.patch/boost/smart_ptr/detail/spinlock_gcc_arm.hpp 1970-01-01 01:00:00.000000000 +0100 +++ 1.41.0-3ubuntu2/.pc/gcc-intrinsics-nocmake.patch/boost/smart_ptr/detail/spinlock_gcc_arm.hpp 2009-03-02 16:22:16.000000000 +0000 @@ -0,0 +1,85 @@ +#ifndef BOOST_SMART_PTR_DETAIL_SPINLOCK_GCC_ARM_HPP_INCLUDED +#define BOOST_SMART_PTR_DETAIL_SPINLOCK_GCC_ARM_HPP_INCLUDED + +// +// Copyright (c) 2008 Peter Dimov +// +// Distributed under the Boost Software License, Version 1.0. +// See accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) +// + +#include + +namespace boost +{ + +namespace detail +{ + +class spinlock +{ +public: + + int v_; + +public: + + bool try_lock() + { + int r; + + __asm__ __volatile__( + "swp %0, %1, [%2]": + "=&r"( r ): // outputs + "r"( 1 ), "r"( &v_ ): // inputs + "memory", "cc" ); + + return r == 0; + } + + void lock() + { + for( unsigned k = 0; !try_lock(); ++k ) + { + boost::detail::yield( k ); + } + } + + void unlock() + { + __asm__ __volatile__( "" ::: "memory" ); + *const_cast< int volatile* >( &v_ ) = 0; + } + +public: + + class scoped_lock + { + private: + + spinlock & sp_; + + scoped_lock( scoped_lock const & ); + scoped_lock & operator=( scoped_lock const & ); + + public: + + explicit scoped_lock( spinlock & sp ): sp_( sp ) + { + sp.lock(); + } + + ~scoped_lock() + { + sp_.unlock(); + } + }; +}; + +} // namespace detail +} // namespace boost + +#define BOOST_DETAIL_SPINLOCK_INIT {0} + +#endif // #ifndef BOOST_SMART_PTR_DETAIL_SPINLOCK_GCC_ARM_HPP_INCLUDED diff -pruN 1.41.0-3/project-config.jam 1.41.0-3ubuntu2/project-config.jam --- 1.41.0-3/project-config.jam 1970-01-01 01:00:00.000000000 +0100 +++ 1.41.0-3ubuntu2/project-config.jam 2010-02-05 05:42:08.000000000 +0000 @@ -0,0 +1,34 @@ +# Boost.Build Configuration +# Automatically generated by bootstrap.sh + +import option ; +import feature ; + +# Compiler configuration. This definition will be used unless +# you already have defined some toolsets in your user-config.jam +# file. +if ! gcc in [ feature.values ] +{ + using gcc ; +} + +project : default-build gcc ; + +# Python configuration +using python : 2.6 : /usr ; + +path-constant ICU_PATH : /usr ; + + +# List of --with- and --without- +# options. If left empty, all libraries will be built. +# Options specified on the command line completely +# override this variable. +libraries = ; + +# These settings are equivivalent to corresponding command-line +# options. +option.set prefix : /scratch/packages/tmp/merges/boost1.41-1.41.0/debian/tmp/usr ; +option.set exec-prefix : /scratch/packages/tmp/merges/boost1.41-1.41.0/debian/tmp/usr ; +option.set libdir : /scratch/packages/tmp/merges/boost1.41-1.41.0/debian/tmp/usr/lib ; +option.set includedir : /scratch/packages/tmp/merges/boost1.41-1.41.0/debian/tmp/usr/include ;