diff -pruN 1.74.0-14/debian/changelog 1.74.0-14ubuntu4/debian/changelog --- 1.74.0-14/debian/changelog 2022-01-14 08:41:55.000000000 +0000 +++ 1.74.0-14ubuntu4/debian/changelog 2022-04-29 12:02:38.000000000 +0000 @@ -1,3 +1,28 @@ +boost1.74 (1.74.0-14ubuntu4) kinetic; urgency=medium + + * No-change rebuild against latest icu + + -- Jeremy Bicha Fri, 29 Apr 2022 08:02:38 -0400 + +boost1.74 (1.74.0-14ubuntu3) jammy; urgency=medium + + * No-change rebuild with Python 3.10 only + + -- Graham Inggs Wed, 16 Mar 2022 22:34:02 +0000 + +boost1.74 (1.74.0-14ubuntu2) jammy; urgency=medium + + * No-change rebuild for icu soname change. + + -- Matthias Klose Wed, 09 Feb 2022 05:38:48 +0100 + +boost1.74 (1.74.0-14ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Drop unused packages on i386. + + -- Gianfranco Costamagna Mon, 17 Jan 2022 15:34:56 +0100 + boost1.74 (1.74.0-14) unstable; urgency=medium * Fix b2 compilation on kFreeBSD (closes: #1003384). @@ -5,6 +30,13 @@ boost1.74 (1.74.0-14) unstable; urgency= -- Giovanni Mascellani Fri, 14 Jan 2022 09:41:55 +0100 +boost1.74 (1.74.0-13ubuntu1) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Drop unused packages on i386. + + -- Gianfranco Costamagna Sat, 20 Nov 2021 22:50:19 +0100 + boost1.74 (1.74.0-13) unstable; urgency=medium [ Anton Gladky ] @@ -65,6 +97,72 @@ boost1.74 (1.74.0-9) unstable; urgency=m -- Anton Gladky Sat, 13 Mar 2021 09:21:38 +0100 +boost1.74 (1.74.0-8ubuntu9) jammy; urgency=medium + + * Cherry-pick upstream commits: + - debian/patches/e193f080c7d209516ac9b712fa0c50bb08026fa2.patch: + Fix regex to allow search for python3.10 too (fixes e.g. + ros-image-common build) + + -- Gianfranco Costamagna Fri, 05 Nov 2021 10:57:52 +0100 + +boost1.74 (1.74.0-8ubuntu8) jammy; urgency=medium + + * Cherry-pick upstream commits: + - Convert Python 3.1+ to use public C API for filenames + - Replace private _Py_fopen() with public fopen(): private _Py_fopen() + - Fix Python 3.10 (PEP-620) incompatibility + + -- Graham Inggs Wed, 20 Oct 2021 13:47:12 +0200 + +boost1.74 (1.74.0-8ubuntu7) jammy; urgency=medium + + * No-change rebuild to add python3.10. + + -- Matthias Klose Mon, 18 Oct 2021 00:18:45 +0200 + +boost1.74 (1.74.0-8ubuntu6) impish; urgency=medium + + * Install the boost.mpi Python module + * Enable demo1 and demo2 in mpi-python test + + -- Graham Inggs Mon, 13 Sep 2021 07:41:14 +0000 + +boost1.74 (1.74.0-8ubuntu5) impish; urgency=medium + + * Cherry-pick patches from upstream to fix #include errors in + graph and graph_parallel + * Skip demo1 in mpi-python test which has never worked with 1.74 + * Allow stderr output in python test + * Use newer examples for demo1 and demo2 in context test + + -- Graham Inggs Sat, 11 Sep 2021 12:25:53 +0000 + +boost1.74 (1.74.0-8ubuntu4) impish; urgency=medium + + * Explicitly set fpu mode on armhf. + + -- Matthias Klose Fri, 10 Sep 2021 20:33:59 +0200 + +boost1.74 (1.74.0-8ubuntu3) impish; urgency=medium + + * d/tests/control: test the boost 1.74 packages, not the 1.71 ones. + + -- Michael Hudson-Doyle Mon, 16 Aug 2021 15:11:57 +1200 + +boost1.74 (1.74.0-8ubuntu2) hirsute; urgency=medium + + * No change rebuild with fixed ownership. + + -- Dimitri John Ledkov Tue, 16 Feb 2021 15:10:45 +0000 + +boost1.74 (1.74.0-8ubuntu1) hirsute; urgency=medium + + * Merge with Debian; remaining changes: + - Drop unused packages on i386. + + -- Dimitri John Ledkov Mon, 15 Feb 2021 12:06:34 +0000 + boost1.74 (1.74.0-8) unstable; urgency=medium * [85a2610] Fix compilation warnings. (Closes: #980497) @@ -104,6 +202,31 @@ boost1.74 (1.74.0-4) unstable; urgency=m -- Anton Gladky Sun, 13 Dec 2020 22:55:30 +0100 +boost1.74 (1.74.0-3ubuntu4) hirsute; urgency=medium + + * iostreams depends on regex, so re-enable that on i386 as well. + + -- Steve Langasek Thu, 28 Jan 2021 17:27:24 -0800 + +boost1.74 (1.74.0-3ubuntu3) hirsute; urgency=medium + + * Readd iostreams on i386, needed by thin-provisioning-tools. + + -- Steve Langasek Thu, 28 Jan 2021 12:11:09 -0800 + +boost1.74 (1.74.0-3ubuntu2) hirsute; urgency=medium + + * Fix property_tree for boost1.74 boost serialization/archive. + + -- Dimitri John Ledkov Sun, 13 Dec 2020 14:17:20 +0000 + +boost1.74 (1.74.0-3ubuntu1) hirsute; urgency=medium + + * Merge with Debian; remaining changes: + - Drop unused packages on i386. + + -- Matthias Klose Wed, 09 Dec 2020 15:19:22 +0100 + boost1.74 (1.74.0-3) unstable; urgency=medium * [b66a37a] Install b2. (Closes: #975446) @@ -125,6 +248,12 @@ boost1.74 (1.74.0-2) unstable; urgency=m -- Anton Gladky Tue, 17 Nov 2020 22:30:42 +0100 +boost1.74 (1.74.0-1ubuntu1) hirsute; urgency=medium + + * Drop unused packages on i386. + + -- Dimitri John Ledkov Thu, 05 Nov 2020 17:46:49 +0000 + boost1.74 (1.74.0-1) unstable; urgency=medium * New upstream version. diff -pruN 1.74.0-14/debian/control 1.74.0-14ubuntu4/debian/control --- 1.74.0-14/debian/control 2022-01-14 08:41:55.000000000 +0000 +++ 1.74.0-14ubuntu4/debian/control 2022-01-14 15:49:33.000000000 +0000 @@ -2,18 +2,20 @@ Source: boost1.74 Homepage: https://www.boost.org/ Section: libs Priority: optional -Maintainer: Debian Boost Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Boost Team Uploaders: Steve M. Robbins , Giovanni Mascellani , Anton Gladky Build-Depends: 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, + zlib1g-dev, libbz2-dev, liblzma-dev, libzstd-dev, libicu-dev (>= 63.1), mpi-default-dev [!i386], bison, flex, docbook-to-man, help2man, xsltproc, doxygen, docbook-xsl, docbook-xml, texlive-latex-base, ghostscript, dh-python, g++ (>= 4:5-0), - python3, python3-all-dev (>= 3.1), python3-numpy + python3, python3-all-dev (>= 3.1), python3-numpy [!i386] Build-Depends-Indep: graphviz Build-Conflicts: libopenmpi-dev (= 1.3.2-2) Vcs-Browser: https://salsa.debian.org/debian/boost @@ -28,38 +30,38 @@ Depends: ${misc:Depends}, ${shlibs:Depen Suggests: libboost1.74-doc, libboost-atomic1.74-dev, libboost-chrono1.74-dev, - libboost-container1.74-dev, - libboost-context1.74-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], - libboost-contract1.74-dev, - libboost-coroutine1.74-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], + libboost-container1.74-dev [!i386], + libboost-context1.74-dev [hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], + libboost-contract1.74-dev [!i386], + libboost-coroutine1.74-dev [hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], libboost-date-time1.74-dev, - libboost-exception1.74-dev, - libboost-fiber1.74-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], + libboost-exception1.74-dev [!i386], + libboost-fiber1.74-dev [hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], libboost-filesystem1.74-dev, - libboost-graph1.74-dev, - libboost-graph-parallel1.74-dev, + libboost-graph1.74-dev [!i386], + libboost-graph-parallel1.74-dev [!i386], libboost-iostreams1.74-dev, - libboost-locale1.74-dev, - libboost-log1.74-dev, - libboost-math1.74-dev, - libboost-mpi1.74-dev, - libboost-mpi-python1.74-dev, - libboost-numpy1.74-dev, - libboost-program-options1.74-dev, - libboost-python1.74-dev, - libboost-random1.74-dev, + libboost-locale1.74-dev [!i386], + libboost-log1.74-dev [!i386], + libboost-math1.74-dev [!i386], + libboost-mpi1.74-dev [!i386], + libboost-mpi-python1.74-dev [!i386], + libboost-numpy1.74-dev [!i386], + libboost-program-options1.74-dev [!i386], + libboost-python1.74-dev [!i386], + libboost-random1.74-dev [!i386], libboost-regex1.74-dev, libboost-serialization1.74-dev, - libboost-stacktrace1.74-dev, + libboost-stacktrace1.74-dev [!i386], libboost-system1.74-dev, libboost-test1.74-dev, libboost-thread1.74-dev, - libboost-timer1.74-dev, - libboost-type-erasure1.74-dev, - libboost-wave1.74-dev, - libboost1.74-tools-dev, + libboost-timer1.74-dev [!i386], + libboost-type-erasure1.74-dev [!i386], + libboost-wave1.74-dev [!i386], + libboost1.74-tools-dev [!i386], libmpfrc++-dev, libntl-dev, - libboost-nowide1.74-dev + libboost-nowide1.74-dev [!i386] Conflicts: bjam, boost-build, libboost1.42-dev, libboost1.46-dev, libboost1.48-dev, libboost1.49-dev, libboost1.50-dev, libboost1.52-dev, libboost1.53-dev, libboost1.54-dev, libboost1.55-dev, libboost1.57-dev, libboost1.58-dev, libboost1.60-dev, libboost1.61-dev, libboost1.62-dev, libboost1.63-dev, libboost1.65-dev, libboost1.67-dev, libboost1.70-dev, libboost1.71-dev Breaks: libleatherman-dev (<< 1.12.1+dfsg-1.1~) Replaces: libleatherman-dev (<< 1.12.1+dfsg-1.1~) @@ -79,7 +81,7 @@ Description: Boost C++ Libraries develop library. Package: libboost1.74-tools-dev -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: foreign Section: libdevel Depends: ${misc:Depends}, ${shlibs:Depends} @@ -108,38 +110,38 @@ Architecture: any Section: libdevel Depends: ${misc:Depends}, libboost1.74-dev, - libboost1.74-tools-dev, + libboost1.74-tools-dev [!i386], libboost-atomic1.74-dev, libboost-chrono1.74-dev, - libboost-container1.74-dev, - libboost-context1.74-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], - libboost-coroutine1.74-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], + libboost-container1.74-dev [!i386], + libboost-context1.74-dev [hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], + libboost-coroutine1.74-dev [hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], libboost-date-time1.74-dev, - libboost-exception1.74-dev, - libboost-fiber1.74-dev [i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], + libboost-exception1.74-dev [!i386], + libboost-fiber1.74-dev [hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x], libboost-filesystem1.74-dev, - libboost-graph1.74-dev, - libboost-graph-parallel1.74-dev, + libboost-graph1.74-dev [!i386], + libboost-graph-parallel1.74-dev [!i386], libboost-iostreams1.74-dev, - libboost-locale1.74-dev, - libboost-log1.74-dev, - libboost-math1.74-dev, - libboost-mpi1.74-dev, - libboost-mpi-python1.74-dev, - libboost-numpy1.74-dev, - libboost-program-options1.74-dev, - libboost-python1.74-dev, - libboost-random1.74-dev, + libboost-locale1.74-dev [!i386], + libboost-log1.74-dev [!i386], + libboost-math1.74-dev [!i386], + libboost-mpi1.74-dev [!i386], + libboost-mpi-python1.74-dev [!i386], + libboost-numpy1.74-dev [!i386], + libboost-program-options1.74-dev [!i386], + libboost-python1.74-dev [!i386], + libboost-random1.74-dev [!i386], libboost-regex1.74-dev, libboost-serialization1.74-dev, - libboost-stacktrace1.74-dev, + libboost-stacktrace1.74-dev [!i386], libboost-system1.74-dev, libboost-test1.74-dev, libboost-thread1.74-dev, - libboost-timer1.74-dev, - libboost-type-erasure1.74-dev, - libboost-wave1.74-dev, - libboost-nowide1.74-dev + libboost-timer1.74-dev [!i386], + libboost-type-erasure1.74-dev [!i386], + libboost-wave1.74-dev [!i386], + libboost-nowide1.74-dev [!i386] Description: Boost C++ Libraries development files (ALL) The Boost web site provides free, peer-reviewed, portable C++ source libraries. The emphasis is on libraries which work well with the C++ @@ -307,7 +309,7 @@ Description: C++ representation of time Package: libboost-container1.74.0 Homepage: http://boost.org/libs/container/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -340,7 +342,7 @@ Description: C++ library that implements Package: libboost-container1.74-dev Homepage: http://boost.org/libs/container/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, @@ -376,7 +378,7 @@ Conflicts: libboost-container1.65-dev, l Package: libboost-context1.74.0 Homepage: http://www.boost.org/libs/context/ -Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x +Architecture: amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -395,7 +397,7 @@ Description: provides a sort of cooperat Package: libboost-context1.74-dev Homepage: http://www.boost.org/libs/context/ -Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x +Architecture: amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, @@ -418,7 +420,7 @@ Conflicts: libboost-context1.53-dev, lib Package: libboost-contract1.74.0 Homepage: http://boost.org/libs/contract/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -433,7 +435,7 @@ Description: Contract library for C++ Package: libboost-contract1.74-dev Homepage: http://boost.org/libs/contract/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, @@ -451,7 +453,7 @@ Conflicts: libboost-contract1.67-dev, li Package: libboost-coroutine1.74.0 Homepage: http://www.boost.org/libs/coroutine/ -Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x +Architecture: amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -475,7 +477,7 @@ Description: provides a sort of cooperat Package: libboost-coroutine1.74-dev Homepage: http://www.boost.org/libs/coroutine/ -Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x +Architecture: amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, @@ -531,7 +533,7 @@ Description: set of date-time libraries Package: libboost-exception1.74-dev Homepage: http://www.boost.org/libs/exception/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, @@ -546,7 +548,7 @@ Conflicts: libboost-exception1.50-dev, l Package: libboost-fiber1.74.0 Homepage: http://www.boost.org/libs/fiber/ -Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x +Architecture: amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -575,7 +577,7 @@ Description: cooperatively-scheduled mic Package: libboost-fiber1.74-dev Homepage: http://www.boost.org/libs/fiber/ -Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x +Architecture: amd64 kfreebsd-amd64 armel armhf arm64 mips mipsel mips64el powerpc ppc64el riscv64 s390x Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, @@ -639,7 +641,7 @@ Description: filesystem operations (port Package: libboost-graph1.74.0 Homepage: http://www.boost.org/libs/graph/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -655,7 +657,7 @@ Description: generic graph components an Package: libboost-graph1.74-dev Homepage: http://www.boost.org/libs/graph/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, @@ -676,7 +678,7 @@ Description: generic graph components an Package: libboost-graph-parallel1.74.0 Homepage: http://www.boost.org/libs/graph_parallel/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} Suggests: graphviz @@ -692,7 +694,7 @@ Description: generic graph components an Package: libboost-graph-parallel1.74-dev Homepage: http://www.boost.org/libs/graph_parallel/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Section: libdevel Depends: ${misc:Depends}, libboost1.74-dev (= ${binary:Version}), @@ -742,7 +744,7 @@ Description: Boost.Iostreams Library dev Package: libboost-locale1.74.0 Homepage: http://www.boost.org/libs/locale/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -771,7 +773,7 @@ Description: C++ facilities for localiza Package: libboost-locale1.74-dev Homepage: http://www.boost.org/libs/math/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, @@ -804,7 +806,7 @@ Description: C++ facilities for localiza Package: libboost-log1.74.0 Homepage: http://www.boost.org/libs/log/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Depends: ${misc:Depends}, ${shlibs:Depends} Description: C++ logging library This package forms part of the Boost C++ Libraries collection. @@ -823,7 +825,7 @@ Description: C++ logging library Package: libboost-log1.74-dev Homepage: http://www.boost.org/libs/log/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Section: libdevel Depends: ${misc:Depends}, libboost-log1.74.0 (= ${binary:Version}), @@ -852,7 +854,7 @@ Conflicts: libboost-log1.54-dev, libboos Package: libboost-math1.74.0 Homepage: http://www.boost.org/libs/math/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -872,7 +874,7 @@ Description: Boost.Math Library Package: libboost-math1.74-dev Homepage: http://www.boost.org/libs/math/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, @@ -895,7 +897,7 @@ Description: Boost.Math Library developm Package: libboost-mpi1.74.0 Homepage: http://www.boost.org/doc/html/mpi.html -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} Description: C++ interface to the Message Passing Interface (MPI) @@ -909,7 +911,7 @@ Description: C++ interface to the Messag Package: libboost-mpi1.74-dev Homepage: http://www.boost.org/doc/html/mpi.html -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Section: libdevel Depends: ${misc:Depends}, libboost1.74-dev (= ${binary:Version}), @@ -929,7 +931,7 @@ Description: C++ interface to the Messag Package: libboost-mpi-python1.74.0 Homepage: http://www.boost.org/doc/html/mpi/python.html -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends}, mpi-default-bin Pre-Depends: ${misc:Pre-Depends} Suggests: python3 @@ -953,7 +955,7 @@ Description: C++ interface to the Messag Package: libboost-mpi-python1.74-dev Homepage: http://www.boost.org/doc/html/mpi/python.html -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Section: libdevel Depends: ${misc:Depends}, libboost-mpi1.74-dev (= ${binary:Version}), @@ -972,7 +974,7 @@ Description: C++ interface to the Messag Package: libboost-nowide1.74.0 Homepage: http://www.boost.org/libs/python/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} Suggests: python3 @@ -989,7 +991,7 @@ Description: Standard library functions Package: libboost-nowide1.74-dev Homepage: http://www.boost.org/libs/python/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Section: libdevel Depends: ${misc:Depends}, libboost-nowide1.74.0 (= ${binary:Version}) @@ -1007,7 +1009,7 @@ Conflicts: libboost-numpy1.65-dev, libbo Package: libboost-numpy1.74.0 Homepage: http://www.boost.org/libs/python/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} Suggests: python3 @@ -1023,7 +1025,7 @@ Description: Boost.Python NumPy extensio Package: libboost-numpy1.74-dev Homepage: http://www.boost.org/libs/python/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Section: libdevel Depends: ${misc:Depends}, libboost-numpy1.74.0 (= ${binary:Version}) @@ -1041,7 +1043,7 @@ Conflicts: libboost-numpy1.65-dev, libbo Package: libboost-program-options1.74.0 Homepage: http://www.boost.org/libs/program_options/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -1054,7 +1056,7 @@ Description: program options library for Package: libboost-program-options1.74-dev Homepage: http://www.boost.org/libs/program_options/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, @@ -1070,7 +1072,7 @@ Description: program options library for Package: libboost-python1.74.0 Homepage: http://www.boost.org/libs/python/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3:Depends} Pre-Depends: ${misc:Pre-Depends} Suggests: python3 @@ -1095,7 +1097,7 @@ Description: Boost.Python Library Package: libboost-python1.74-dev Homepage: http://www.boost.org/libs/python/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Section: libdevel Depends: ${misc:Depends}, libboost1.74-dev (= ${binary:Version}), @@ -1123,7 +1125,7 @@ Description: Boost.Python Library develo Package: libboost-random1.74.0 Homepage: http://www.boost.org/libs/random/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -1136,7 +1138,7 @@ Description: Boost Random Number Library Package: libboost-random1.74-dev Homepage: http://www.boost.org/libs/random/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, @@ -1243,7 +1245,7 @@ Description: serialization library for C Package: libboost-stacktrace1.74.0 Homepage: http://boost.org/libs/stacktrace/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -1255,7 +1257,7 @@ Description: library to capture and prin Package: libboost-stacktrace1.74-dev Homepage: http://boost.org/libs/stacktrace/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, @@ -1373,7 +1375,7 @@ Description: portable C++ multi-threadin Package: libboost-timer1.74.0 Homepage: http://www.boost.org/libs/timer/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -1391,7 +1393,7 @@ Description: C++ wall clock and CPU proc Package: libboost-timer1.74-dev Homepage: http://www.boost.org/libs/timer/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, @@ -1413,7 +1415,7 @@ Description: C++ wall clock and CPU proc Package: libboost-type-erasure1.74.0 Homepage: http://www.boost.org/doc/libs/1_60_0/doc/html/boost_typeerasure.html -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -1427,7 +1429,7 @@ Description: C++ runtime polymorphism ba Package: libboost-type-erasure1.74-dev Homepage: http://www.boost.org/doc/libs/1_60_0/doc/html/boost_typeerasure.html -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, @@ -1446,7 +1448,7 @@ Conflicts: libboost-type-erasure1.60-dev Package: libboost-wave1.74.0 Homepage: http://www.boost.org/libs/wave/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} @@ -1460,7 +1462,7 @@ Description: C99/C++ preprocessor librar Package: libboost-wave1.74-dev Homepage: http://www.boost.org/libs/wave/ -Architecture: any +Architecture: amd64 arm64 armhf s390x ppc64el riscv64 Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, diff -pruN 1.74.0-14/debian/rules 1.74.0-14ubuntu4/debian/rules --- 1.74.0-14/debian/rules 2022-01-14 08:41:55.000000000 +0000 +++ 1.74.0-14ubuntu4/debian/rules 2022-01-14 15:49:33.000000000 +0000 @@ -2,6 +2,19 @@ DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/default.mk + +ifeq ($(DEB_BUILD_ARCH), i386) +boost_libs := atomic chrono date-time filesystem iostreams \ + regex serialization system test thread +JAM_WITHOUT += --without-container --without-contract --without-exception \ + --without-graph --without-graph_parallel \ + --without-locale --without-log --without-math --without-mpi --without-nowide \ + --without-program_options --without-random \ + --without-stacktrace --without-timer --without-type_erasure \ + --without-wave +else # 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 @@ -10,6 +23,7 @@ boost_libs := atomic chrono container co mpi-python nowide program-options python random regex \ serialization stacktrace system test thread timer \ type-erasure wave +endif # these are special cases, where /usr/lib name differs from Boost library name boost_lib_log := log log_setup @@ -35,9 +49,6 @@ boost_suffixes_mpi-python := $(pyverids) # Files that are generated by filtering a template filtered_files = -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/default.mk - # set the number of build jobs ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) @@ -152,6 +163,7 @@ BUILD_CONTEXT = no else ifeq ($(DEB_BUILD_ARCH), i386) ifeq ($(DEB_VENDOR), Ubuntu) BUILD_NUMPY = no +BUILD_CONTEXT = no endif else ifeq ($(DEB_BUILD_ARCH), ia64) BUILD_CONTEXT = no @@ -213,10 +225,12 @@ endif override_dh_auto_build-common: $(b2) b2.1 bjam.1 $(JAM) $(JAM_WITHOUT) --without-python +ifneq ($(DEB_BUILD_ARCH), i386) set -e ; for pyver in $(pyversions); do \ echo "Building Boost.Python for python version $$pyver"; \ $(JAM) --build-dir=build-$$pyver --stagedir=stage-$$pyver --user-config=$(CURDIR)/user-config-$$pyver.jam --with-python --with-mpi python=$$pyver; \ done +endif cd $(bbv2dir) && ./bootstrap.sh --with-toolset=gcc cd tools/bcp && $(JAM) @@ -271,11 +285,13 @@ override_dh_install-arch: override_dh_in $(JAM) --prefix=$(CURDIR)/debian/tmp/usr $(JAM_WITHOUT) \ --libdir=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) \ --without-python install +ifneq ($(DEB_BUILD_ARCH), i386) set -e ; for pyver in $(pyversions); do \ $(JAM) --build-dir=build-$$pyver --stagedir=stage-$$pyver --user-config=$(CURDIR)/user-config-$$pyver.jam --prefix=$(CURDIR)/debian/tmp/usr \ --libdir=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) \ install --with-python --with-mpi python=$$pyver; \ done +endif find debian/tmp/usr/include debian/tmp/usr/share/boost-build -type f -print0 | xargs -0 chmod 644 find debian/tmp -name .cvsignore | xargs rm -f @@ -337,11 +353,13 @@ override_dh_install-indep: override_dh_i override_dh_makeshlibs: dh_makeshlibs -plibboost-regex$(SOVERSION) -V '$(regexicuabi)' dh_makeshlibs --remaining-packages +ifneq ($(DEB_BUILD_ARCH), i386) sed -i -r 's/^(libboost_python([0-9]{2}) \S+ (\S+).*)$$/\1, \3-py\2/' debian/libboost-python$(SOVERSION)/DEBIAN/shlibs sed -i -r 's/^(libboost_mpi_python([0-9]{2}) \S+ (\S+).*)$$/\1, \3-py\2/' debian/libboost-mpi-python$(SOVERSION)/DEBIAN/shlibs ifeq ($(BUILD_NUMPY), yes) sed -i -r 's/^(libboost_numpy([0-9]{2}) \S+ (\S+).*)$$/\1, \3-py\2/' debian/libboost-numpy$(SOVERSION)/DEBIAN/shlibs endif +endif override_dh_gencontrol: dh_gencontrol -- -V'gxx:major=$(shell dpkg-query -f '$${version}' -W g++ | sed 's/.*://;s/\..*//')' @@ -358,10 +376,12 @@ b2.1 bjam.1: $(b2) user-config.jam: echo $(TOOLSET_CONFIG) > $@ echo "using mpi ;" >> $@ +ifneq ($(DEB_BUILD_ARCH), i386) set -e ; for pyver in $(pyversions); do \ cp $@ user-config-$$pyver.jam; \ echo "using python : $$pyver : /usr ;" >> user-config-$$pyver.jam; \ done +endif echo "using boostbook ;" > user-config-doc.jam echo "using quickbook ;" >> user-config-doc.jam echo "using doxygen ;" >> user-config-doc.jam @@ -381,5 +401,7 @@ make-debhelper: clean-debhelper $(filter @echo usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Boost*-$(SOVERSION)* >> debian/libboost$(PKGVERSION)-dev.install @echo usr/lib/$(DEB_HOST_MULTIARCH)/cmake/boost_headers-$(SOVERSION)* >> debian/libboost$(PKGVERSION)-dev.install @$(call cp_debhelper,libboost-doc,libboost$(PKGVERSION)-doc) +ifneq ($(DEB_BUILD_ARCH), i386) @$(call cp_debhelper,libboost-python-dev,libboost-python$(PKGVERSION)-dev) @$(call cp_debhelper,libboost-mpi-python-dev,libboost-mpi-python$(PKGVERSION)-dev) +endif diff -pruN 1.74.0-14/debian/tests/mpi-python 1.74.0-14ubuntu4/debian/tests/mpi-python --- 1.74.0-14/debian/tests/mpi-python 2022-01-14 08:41:55.000000000 +0000 +++ 1.74.0-14ubuntu4/debian/tests/mpi-python 2022-01-14 15:49:34.000000000 +0000 @@ -16,4 +16,4 @@ mpirun --oversubscribe --allow-run-as-ro echo "run: demo1 OK" mpirun --oversubscribe --allow-run-as-root -np 2 python3 ./demo2.py -echo "run: demo2 BROKEN FIXME" +echo "run: demo2 OK"