feat: update boost1.83 to 1.83.0-4

debian/changelog

@@ -1,3 +1,49 @@
+boost1.83 (1.83.0-4) unstable; urgency=medium
+
+  [ Samuel Thibault ]
+  * control: Add hurd-amd64 for context, coroutine, fiber packages.
+  * [a2dab5e] control: Add hurd-amd64 for context, coroutine, fiber packages.
+
+  [ Heinrich Schuchardt ]
+  * [62a479e] Fix autopkgtests fail on armhf. (Closes: #1079106)
+
+  [ Anton Gladky ]
+  * [49b0d7f] Update the minimal cmake version for autopkgtest to 3.18.
+              (Closes: #1087853)
+
+ -- Anton Gladky <[email protected]>  Sat, 07 Dec 2024 20:39:34 +0100
+
+boost1.83 (1.83.0-3.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Additional workaround for broken architecture detection under x32
+    (Closes: #1079358)
+
+ -- Mattias Ellert <[email protected]>  Thu, 22 Aug 2024 14:09:24 +0200
+
+boost1.83 (1.83.0-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "Boost.Signals2 causes FTBFS", cherry-picking upstream patch
+   (Closes: #1056100)
+  * Fix "autopkgtest regression with CMake 3.30+", enforcing the new CMP0167
+    policy. (Closes: #1076426)
+
+ -- Tobias Frost <[email protected]>  Tue, 30 Jul 2024 09:09:13 +0200
+
+boost1.83 (1.83.0-3) unstable; urgency=medium
+
+  * [4b317f3] Add upstream fix for dogecoin. (Closes: #1059133)
+
+ -- Anton Gladky <[email protected]>  Mon, 27 May 2024 06:59:36 +0200
+
+boost1.83 (1.83.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062027
+
+ -- Steve Langasek <[email protected]>  Wed, 28 Feb 2024 04:40:55 +0000
+
 boost1.83 (1.83.0-2) unstable; urgency=medium
 
   * [139123a] Add dep to libboost1.83-all-dev on libboost-url1.83-dev. (Closes: #1058948)

debian/control

@@ -6,7 +6,7 @@ Maintainer: Debian Boost Team <[email protected]>
 Uploaders:
  Giovanni Mascellani <[email protected]>,
  Anton Gladky <[email protected]>
-Build-Depends: debhelper-compat (= 12), dpkg-dev (>= 1.16.1~), dctrl-tools, chrpath,
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 12), dpkg-dev (>= 1.16.1~), dctrl-tools, chrpath,
  zlib1g-dev, libbz2-dev, liblzma-dev, libzstd-dev, libicu-dev (>= 63.1), mpi-default-dev,
  bison, flex, docbook-to-man, help2man, xsltproc, doxygen,
  docbook-xsl, docbook-xml, texlive-latex-base, ghostscript,
@@ -28,12 +28,12 @@ Suggests: libboost1.83-doc,
  libboost-atomic1.83-dev,
  libboost-chrono1.83-dev,
  libboost-container1.83-dev,
- libboost-context1.83-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x],
+ libboost-context1.83-dev [i386 hurd-i386 kfreebsd-i386 amd64 hurd-amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x],
  libboost-contract1.83-dev,
- libboost-coroutine1.83-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x],
+ libboost-coroutine1.83-dev [i386 hurd-i386 kfreebsd-i386 amd64 hurd-amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x],
  libboost-date-time1.83-dev,
  libboost-exception1.83-dev,
- libboost-fiber1.83-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x],
+ libboost-fiber1.83-dev [i386 hurd-i386 kfreebsd-i386 amd64 hurd-amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x],
  libboost-filesystem1.83-dev,
  libboost-graph-parallel1.83-dev,
  libboost-graph1.83-dev,
@@ -114,11 +114,11 @@ Depends: ${misc:Depends},
  libboost-atomic1.83-dev,
  libboost-chrono1.83-dev,
  libboost-container1.83-dev,
- libboost-context1.83-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x],
- libboost-coroutine1.83-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x],
+ libboost-context1.83-dev [i386 hurd-i386 kfreebsd-i386 amd64 hurd-amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x],
+ libboost-coroutine1.83-dev [i386 hurd-i386 kfreebsd-i386 amd64 hurd-amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x],
  libboost-date-time1.83-dev,
  libboost-exception1.83-dev,
- libboost-fiber1.83-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x],
+ libboost-fiber1.83-dev [i386 hurd-i386 kfreebsd-i386 amd64 hurd-amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x],
  libboost-filesystem1.83-dev,
  libboost-graph-parallel1.83-dev,
  libboost-graph1.83-dev,
@@ -219,7 +219,10 @@ Description: atomic data types, operations, and memory ordering constraints
  locking.
 Conflicts: libboost-atomic1.53-dev, libboost-atomic1.54-dev, libboost-atomic1.55-dev, libboost-atomic1.57-dev, libboost-atomic1.58-dev, libboost-atomic1.60-dev, libboost-atomic1.61-dev, libboost-atomic1.62-dev, libboost-atomic1.63-dev, libboost-atomic1.65-dev, libboost-atomic1.67-dev, libboost-atomic1.70-dev, libboost-atomic1.71-dev, libboost-atomic1.74-dev, libboost-atomic1.80-dev, libboost-atomic1.81-dev
 
-Package: libboost-chrono1.83.0
+Package: libboost-chrono1.83.0t64
+Provides: ${t64:Provides}
+Replaces: libboost-chrono1.83.0
+Breaks: libboost-chrono1.83.0 (<< ${source:Version})
 Homepage: http://www.boost.org/libs/chrono/
 Architecture: any
 Multi-Arch: same
@@ -269,7 +272,7 @@ Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
  libboost1.83-dev (= ${binary:Version}),
- libboost-chrono1.83.0 (= ${binary:Version})
+ libboost-chrono1.83.0t64 (= ${binary:Version})
 Conflicts: libboost-chrono1.48-dev, libboost-chrono1.49-dev, libboost-chrono1.50-dev, libboost-chrono1.52-dev, libboost-chrono1.53-dev, libboost-chrono1.54-dev, libboost-chrono1.55-dev, libboost-chrono1.57-dev, libboost-chrono1.58-dev, libboost-chrono1.60-dev, libboost-chrono1.61-dev, libboost-chrono1.62-dev, libboost-chrono1.63-dev, libboost-chrono1.65-dev, libboost-chrono1.67-dev, libboost-chrono1.70-dev, libboost-chrono1.71-dev, libboost-chrono1.74-dev, libboost-chrono1.80-dev, libboost-chrono1.81-dev
 Description: C++ representation of time duration, time point, and clocks
  This package forms part of the Boost C++ Libraries collection.
@@ -380,7 +383,7 @@ Conflicts: libboost-container1.65-dev, libboost-container1.67-dev, libboost-cont
 
 Package: libboost-context1.83.0
 Homepage: http://www.boost.org/libs/context/
-Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x
+Architecture: i386 hurd-i386 kfreebsd-i386 amd64 hurd-amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
@@ -399,7 +402,7 @@ Description: provides a sort of cooperative multitasking on a single thread
 
 Package: libboost-context1.83-dev
 Homepage: http://www.boost.org/libs/context/
-Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x
+Architecture: i386 hurd-i386 kfreebsd-i386 amd64 hurd-amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
@@ -455,7 +458,7 @@ Conflicts: libboost-contract1.67-dev, libboost-contract1.70-dev, libboost-contra
 
 Package: libboost-coroutine1.83.0
 Homepage: http://www.boost.org/libs/coroutine/
-Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x
+Architecture: i386 hurd-i386 kfreebsd-i386 amd64 hurd-amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
@@ -479,7 +482,7 @@ Description: provides a sort of cooperative multitasking on a single thread
 
 Package: libboost-coroutine1.83-dev
 Homepage: http://www.boost.org/libs/coroutine/
-Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x
+Architecture: i386 hurd-i386 kfreebsd-i386 amd64 hurd-amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
@@ -550,7 +553,7 @@ Conflicts: libboost-exception1.50-dev, libboost-exception1.52-dev, libboost-exce
 
 Package: libboost-fiber1.83.0
 Homepage: http://www.boost.org/libs/fiber/
-Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x
+Architecture: i386 hurd-i386 kfreebsd-i386 amd64 hurd-amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
@@ -579,7 +582,7 @@ Description: cooperatively-scheduled micro-/userland-threads
 
 Package: libboost-fiber1.83-dev
 Homepage: http://www.boost.org/libs/fiber/
-Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x
+Architecture: i386 hurd-i386 kfreebsd-i386 amd64 hurd-amd64 kfreebsd-amd64 armel armhf arm64 loong64 mips mipsel mips64el powerpc ppc64el riscv64 s390x
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},

debian/patches/60.patch

@@ -0,0 +1,26 @@
+From 4384bf0ecb9eb13cdc1727b7c43d085445e37c3d Mon Sep 17 00:00:00 2001
+From: NatUni <[email protected]>
+Date: Tue, 9 Jan 2024 17:47:56 -0500
+Subject: [PATCH] Fix issue documented in Debian bug #1059133
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+I am surely out of my depth here, but this Works4Me™. See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1059133
+---
+ libs/function/include/boost/function/function_base.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: boost/libs/function/include/boost/function/function_base.hpp
+===================================================================
+--- boost.orig/libs/function/include/boost/function/function_base.hpp
++++ boost/libs/function/include/boost/function/function_base.hpp
+@@ -648,7 +648,7 @@ public:
+                       detail::function::check_functor_type_tag);
+       // GCC 2.95.3 gets the CV qualifiers wrong here, so we
+       // can't do the static_cast that we should do.
+-      return static_cast<const Functor*>(type_result.members.obj_ptr);
++      return reinterpret_cast<const Functor*>(type_result.members.obj_ptr);
+     }
+
+   template<typename F>

debian/patches/70-boost-causing-ftbfs-signal2-part1.patch

@@ -0,0 +1,128 @@
+From 2ba258f7b465e7bde14663ca3a966019b4ec3694 Mon Sep 17 00:00:00 2001
+From: Frank Mori Hess <[email protected]>
+Date: Sat, 30 Dec 2023 14:34:58 -0500
+Subject: [PATCH] Fix disconnect by slot when the slot is another signal.
+
+---
+ .../boost/signals2/detail/signal_template.hpp | 48 +++++++++++++++----
+ 1 file changed, 39 insertions(+), 9 deletions(-)
+
+diff --git a/libs/signals2/include/boost/signals2/detail/signal_template.hpp b/include/boost/signals2/detail/signal_template.hpp
+index a399883c..4546906d 100644
+--- a/libs/signals2/include/boost/signals2/detail/signal_template.hpp
++++ b/libs/signals2/include/boost/signals2/detail/signal_template.hpp
+@@ -103,9 +103,9 @@ namespace boost
+               BOOST_SIGNALS2_FORWARDED_ARGS(BOOST_SIGNALS2_NUM_ARGS));
+         }
+         template<typename T>
+-          bool operator==(const T &other) const
++          bool contains(const T &other) const
+         {
+-          return _fun == other;
++          return _fun.contains(other);
+         }
+       private:
+         BOOST_SIGNALS2_BOUND_EXTENDED_SLOT_FUNCTION_N(BOOST_SIGNALS2_NUM_ARGS)()
+@@ -115,6 +115,8 @@ namespace boost
+         boost::shared_ptr<connection> _connection;
+       };
+
++      template<BOOST_SIGNALS2_SIGNAL_TEMPLATE_DECL(BOOST_SIGNALS2_NUM_ARGS)>
++        class BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS);
+       template<BOOST_SIGNALS2_SIGNAL_TEMPLATE_DECL(BOOST_SIGNALS2_NUM_ARGS)>
+         class BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS);
+
+@@ -150,6 +152,8 @@ namespace boost
+         typedef GroupCompare group_compare_type;
+         typedef typename detail::slot_call_iterator_t<slot_invoker,
+           typename connection_list_type::iterator, connection_body<group_key_type, slot_type, Mutex> > slot_call_iterator;
++        typedef detail::BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)
++          <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> weak_signal_type;
+
+         BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)(const combiner_type &combiner_arg,
+           const group_compare_type &group_compare):
+@@ -531,13 +535,20 @@ namespace boost
+             {
+               (*it)->nolock_disconnect(lock);
+             }else
+-            {
+-              // check for wrapped extended slot
++            { // check for wrapped extended slot
+               bound_extended_slot_function_type *fp;
+               fp = (*it)->slot().slot_function().template target<bound_extended_slot_function_type>();
+-              if(fp && function_equal(*fp, slot))
++              if(fp && fp->contains(slot))
+               {
+                 (*it)->nolock_disconnect(lock);
++              }else
++              { // check for wrapped signal
++                weak_signal_type *fp;
++                fp = (*it)->slot().slot_function().template target<weak_signal_type>();
++                if(fp && fp->contains(slot))
++                {
++                  (*it)->nolock_disconnect(lock);
++                }
+               }
+             }
+           }
+@@ -588,8 +599,6 @@ namespace boost
+         const boost::shared_ptr<mutex_type> _mutex;
+       };
+
+-      template<BOOST_SIGNALS2_SIGNAL_TEMPLATE_DECL(BOOST_SIGNALS2_NUM_ARGS)>
+-        class BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS);
+     }
+
+     template<BOOST_SIGNALS2_SIGNAL_TEMPLATE_DEFAULTED_DECL(BOOST_SIGNALS2_NUM_ARGS)>
+@@ -603,8 +612,7 @@ namespace boost
+       typedef detail::BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)
+         <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> impl_class;
+     public:
+-      typedef detail::BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)
+-        <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> weak_signal_type;
++      typedef typename impl_class::weak_signal_type weak_signal_type;
+       friend class detail::BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)
+         <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION>;
+
+@@ -746,12 +754,24 @@ namespace boost
+         using std::swap;
+         swap(_pimpl, other._pimpl);
+       }
++      bool operator==(const BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) & other) const
++      {
++        return _pimpl.get() == other._pimpl.get();
++      }
+     protected:
+       virtual shared_ptr<void> lock_pimpl() const
+       {
+         return _pimpl;
+       }
+     private:
++      // explicit private copy constructor to avoid compiler trying to do implicit conversions to signal
++      explicit BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)(
++        const BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) & other) BOOST_NOEXCEPT
++      {
++          // noncopyable
++          BOOST_ASSERT(false);
++      }
++
+       shared_ptr<impl_class>
+         _pimpl;
+     };
+@@ -802,6 +822,16 @@ namespace boost
+             shared_pimpl(_weak_pimpl.lock());
+           return (*shared_pimpl)(BOOST_SIGNALS2_SIGNATURE_ARG_NAMES(BOOST_SIGNALS2_NUM_ARGS));
+         }
++        bool contains(const BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)
++          <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> &signal) const
++        {
++          return _weak_pimpl.lock().get() == signal._pimpl.get(); 
++        }
++        template <typename T>
++        bool contains(const T&) const
++        {
++          return false;
++        }
+       private:
+         boost::weak_ptr<detail::BOOST_SIGNALS2_SIGNAL_IMPL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)
+           <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> > _weak_pimpl;

debian/patches/71-boost-causing-ftbfs-signal2-part2.patch

@@ -0,0 +1,24 @@
+From 4d994bbed820882059c7842ba5e230a26d68f2f0 Mon Sep 17 00:00:00 2001
+From: Frank Mori Hess <[email protected]>
+Date: Sat, 30 Dec 2023 14:51:49 -0500
+Subject: [PATCH] Fix disconnect by slot when slot is wrapped in a
+ boost::reference_wrapper
+
+---
+ include/boost/signals2/detail/signal_template.hpp | 2 +-
+ test/signal_test.cpp                              | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/include/boost/signals2/detail/signal_template.hpp b/include/boost/signals2/detail/signal_template.hpp
+index 4546906d..0bed2dd1 100644
+--- a/libs/signals2/include/boost/signals2/detail/signal_template.hpp
++++ b/libs/signals2/include/boost/signals2/detail/signal_template.hpp
+@@ -223,7 +223,7 @@ namespace boost
+         void disconnect(const T &slot)
+         {
+           typedef mpl::bool_<(is_convertible<T, group_type>::value)> is_group;
+-          do_disconnect(slot, is_group());
++          do_disconnect(unwrap_ref(slot), is_group());
+         }
+         // emit signal
+         result_type operator ()(BOOST_SIGNALS2_SIGNATURE_FULL_ARGS(BOOST_SIGNALS2_NUM_ARGS))

debian/patches/series

@@ -6,3 +6,6 @@ fix_extension.patch
 30.patch
 40.patch
 50.patch
+60.patch
+70-boost-causing-ftbfs-signal2-part1.patch
+71-boost-causing-ftbfs-signal2-part2.patch

debian/rules

@@ -69,11 +69,11 @@ boost_suffixes = $(if $(boost_suffixes_$(1)), $(boost_suffixes_$(1)),"")
 mk_base_name = usr/lib/$(DEB_HOST_MULTIARCH)/libboost_$(subst -,_,$(1))$(2)
 mk_cmake_name = usr/lib/$(DEB_HOST_MULTIARCH)/cmake/boost_$(subst -,_,$(1))-$(SOVERSION)/
 
+t64_suffix_chrono = t64
 # Input: component
 # Return: package name for shared library or development
-mk_pkg_lib = libboost-$(1)$(SOVERSION)
+mk_pkg_lib = libboost-$(1)$(SOVERSION)$(t64_suffix_$(1))
 mk_pkg_dev = libboost-$(1)$(PKGVERSION)-dev
-
 # Helpers to generate debhelper input filenames.
 # Input: component
 # Return: prefix to debhelper filenames
@@ -182,7 +182,9 @@ JAM_DOC = $(b2) $(JOBS) -q -d2 --ignore-site-config --user-config=$(CURDIR)/user
 override_dh_auto_configure: user-config.jam make-debhelper
 ifeq ($(DEB_BUILD_ARCH), x32)
 	cp tools/build/src/tools/gcc.jam tools/build/src/tools/gcc.jam.bak
-	sed -i -e 's|^.*compile-link-flags.*-m32.*|#\0|g' tools/build/src/tools/gcc.jam
+	sed -i -e 's|^.*compile-link-flags.*-m32.*|#\0|g' \
+	       -e 's|^.*toolset.flags.*-march=i686.*|#\0|g' \
+		tools/build/src/tools/gcc.jam
 endif
 
 override_dh_auto_build-common: $(b2) b2.1 bjam.1

debian/tests/atomic

@@ -11,7 +11,7 @@ mkdir -p $WORKDIR/build
 cp debian/tests/srcs/atomic/* $WORKDIR/src/
 
 cd $WORKDIR/build
-cmake ./../src
+cmake -DCMAKE_POLICY_DEFAULT_CMP0167=NEW ./../src
 make
 
 echo "build: OK"

debian/tests/chrono

@@ -11,7 +11,7 @@ mkdir -p $WORKDIR/build
 cp debian/tests/srcs/chrono/* $WORKDIR/src/
 
 cd $WORKDIR/build
-cmake ./../src
+cmake -DCMAKE_POLICY_DEFAULT_CMP0167=NEW ./../src
 make
 
 echo "build: OK"