diff -Nru boost1.65.1-1.65.1+dfsg/debian/changelog boost1.65.1-1.65.1+dfsg/debian/changelog --- boost1.65.1-1.65.1+dfsg/debian/changelog 2018-11-13 08:09:32.000000000 +0000 +++ boost1.65.1-1.65.1+dfsg/debian/changelog 2019-11-29 08:52:13.000000000 +0000 @@ -1,39 +1,10 @@ -boost1.65.1 (1.65.1+dfsg-0ubuntu11) disco; urgency=medium +boost1.65.1 (1.65.1+dfsg-0ubuntu5~16.04.sav0) xenial; urgency=medium - * No-change rebuild for icu soname changes. + * Backport to Xenial + * debian/rules: Add "JAM_OPT += cxxflags=-std=c++11" due build failure on + Xenial (GCC 5.4.0) with no boost fiber - -- Matthias Klose Tue, 13 Nov 2018 08:09:32 +0000 - -boost1.65.1 (1.65.1+dfsg-0ubuntu10) disco; urgency=medium - - * No-change rebuild to build for python3.7 as the default. - - -- Matthias Klose Tue, 30 Oct 2018 18:19:15 +0000 - -boost1.65.1 (1.65.1+dfsg-0ubuntu9) cosmic; urgency=medium - - * Drop building with -fpermissive. - * Apply upstream patch for py3.7 compat. - - -- Dimitri John Ledkov 🌈 Fri, 29 Jun 2018 13:14:41 +0100 - -boost1.65.1 (1.65.1+dfsg-0ubuntu8) cosmic; urgency=medium - - * Build with -fpermissive for now. - - -- Matthias Klose Fri, 29 Jun 2018 12:04:01 +0200 - -boost1.65.1 (1.65.1+dfsg-0ubuntu7) cosmic; urgency=medium - - * No-change rebuild to add python3.7 support. - - -- Matthias Klose Fri, 29 Jun 2018 05:39:52 +0200 - -boost1.65.1 (1.65.1+dfsg-0ubuntu6) cosmic; urgency=medium - - * No-change rebuild for dune openmpi soname change. - - -- Matthias Klose Sun, 13 May 2018 16:59:31 +0000 + -- Rob Savoury Fri, 29 Nov 2019 00:52:13 -0800 boost1.65.1 (1.65.1+dfsg-0ubuntu5) bionic; urgency=medium diff -Nru boost1.65.1-1.65.1+dfsg/debian/patches/660487c43fde76f3e64f1cb2e644500da92fe582.patch boost1.65.1-1.65.1+dfsg/debian/patches/660487c43fde76f3e64f1cb2e644500da92fe582.patch --- boost1.65.1-1.65.1+dfsg/debian/patches/660487c43fde76f3e64f1cb2e644500da92fe582.patch 2018-06-29 12:13:46.000000000 +0000 +++ boost1.65.1-1.65.1+dfsg/debian/patches/660487c43fde76f3e64f1cb2e644500da92fe582.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -From 660487c43fde76f3e64f1cb2e644500da92fe582 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= -Date: Fri, 9 Feb 2018 18:20:30 +0100 -Subject: [PATCH] Fix build with Python 3.7 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Python 3.7 changes the return type of _PyUnicode_AsString() -from void* to const char* -- causing the build of boost-python -to fail. - -Signed-off-by: Bernhard Rosenkränzer ---- - src/converter/builtin_converters.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libs/python/src/converter/builtin_converters.cpp b/libs/python/src/converter/builtin_converters.cpp -index 1c28af7fc..ee2d5b479 100644 ---- a/libs/python/src/converter/builtin_converters.cpp -+++ b/libs/python/src/converter/builtin_converters.cpp -@@ -45,11 +45,16 @@ namespace - { - return PyString_Check(obj) ? PyString_AsString(obj) : 0; - } --#else -+#elif PY_VERSION_HEX < 0x03070000 - void* convert_to_cstring(PyObject* obj) - { - return PyUnicode_Check(obj) ? _PyUnicode_AsString(obj) : 0; - } -+#else -+ void* convert_to_cstring(PyObject* obj) -+ { -+ return PyUnicode_Check(obj) ? const_cast(reinterpret_cast(_PyUnicode_AsString(obj))) : 0; -+ } - #endif - - // Given a target type and a SlotPolicy describing how to perform a diff -Nru boost1.65.1-1.65.1+dfsg/debian/patches/series boost1.65.1-1.65.1+dfsg/debian/patches/series --- boost1.65.1-1.65.1+dfsg/debian/patches/series 2018-06-29 12:13:46.000000000 +0000 +++ boost1.65.1-1.65.1+dfsg/debian/patches/series 2017-10-24 15:08:07.000000000 +0000 @@ -5,4 +5,3 @@ no-gcc-m-options.diff no-gcc-march-options.patch make-docs-use-offline-resources-only.patch -660487c43fde76f3e64f1cb2e644500da92fe582.patch diff -Nru boost1.65.1-1.65.1+dfsg/debian/rules boost1.65.1-1.65.1+dfsg/debian/rules --- boost1.65.1-1.65.1+dfsg/debian/rules 2018-06-29 12:14:04.000000000 +0000 +++ boost1.65.1-1.65.1+dfsg/debian/rules 2019-11-29 08:52:13.000000000 +0000 @@ -1,5 +1,8 @@ #! /usr/bin/make -f +# Ensure ISO C++ 2011 standard for Xenial build (GCC 5.4.0) +JAM_OPT += cxxflags=-std=c++11 + # Boost libraries for which we want separate packages # context is conditionally compiled because it is not supported yet on several architectures # coroutine, and fiber depend on context, so they are also conditionally compiled