From db66370fe7ee9b9543d5ceae266d6d7c0fff7b73 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Thu, 27 Sep 2018 12:05:10 -0400 Subject: [PATCH] Disable openmpi and mpich for Flatpak-bundled builds The Fedora OpenMPI and MPICH Flatpaks pose considerable challenges for rebuilding to use in Flaptaks with prefix=/app - in particular because of their use of environment-modules. An analysis of all graphical applications in Fedora that we might want to create Flatpak containers of shows no apps that use the OpenMPI and MPICH subpackages of boost, though many other boost packages are used. So simply disabling openmpi and mpich for Flatpak rebuilds is the simplest approach. --- boost.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/boost.spec b/boost.spec index c072602..2b75e53 100644 --- a/boost.spec +++ b/boost.spec @@ -7,6 +7,12 @@ %global boost_docdir __tmp_docdir %global boost_examplesdir __tmp_examplesdir +%if 0%{?flatpak} +# For bundling in Flatpak, currently build without mpich and openmpi, +# which aren't needed and cause prefix=/app errors. +%bcond_with mpich +%bcond_with openmpi +%else # All arches have mpich %bcond_without mpich @@ -16,6 +22,7 @@ %else %bcond_without openmpi %endif +%endif %ifnarch %{ix86} x86_64 %{arm} ppc64 ppc64le aarch64 %bcond_with context @@ -36,7 +43,7 @@ Name: boost Summary: The free peer-reviewed portable C++ source libraries Version: 1.66.0 %global version_enc 1_66_0 -Release: 14%{?dist} +Release: 15%{?dist} License: Boost and MIT and Python %global toplev_dirname %{name}_%{version_enc} @@ -1484,6 +1491,9 @@ fi %{_mandir}/man1/bjam.1* %changelog +* Thu Sep 27 2018 Owen Taylor - 1.66.0-15 +- Disable openmpi and mpich for Flatpak-bundled builds + * Wed Jul 18 2018 Jonathan Wakely - 1.66.0-14 - Patch numpy for Python 3 (#1596468)