Hello community,

here is the log from the commit of package boost171 for openSUSE:Leap:15.2 
checked in at 2020-01-22 08:19:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/boost171 (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.boost171.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "boost171"

Wed Jan 22 08:19:52 2020 rev:2 rq:766107 version:1.71.0

Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/boost171/boost171.changes      2020-01-17 
11:59:10.116444041 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.boost171.new.26092/boost171.changes   
2020-01-22 08:19:53.810196073 +0100
@@ -1,0 +2,17 @@
+Mon Jan 13 15:06:06 UTC 2020 - Adam Majer <[email protected]>
+
+- Disable non-HPC multibuild flavors
+
+-------------------------------------------------------------------
+Mon Jan 13 10:42:07 UTC 2020 - Christian Goll <[email protected]>
+
+- removed hpc bjam package (boo#1160621)
+- added gnu-hpc-openmpi3 and mpich flavor (boo#1160622)
+
+-------------------------------------------------------------------
+Fri Dec 13 04:03:05 UTC 2019 - Stefan BrĂ¼ns <[email protected]>
+
+- Remove hardcoded abiflags (%py3_abiflags is not available for 3
+  years), use python3-config instead. Fixes build with Python 3.8.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ boost171.spec ++++++
--- /var/tmp/diff_new_pack.H9z1Bf/_old  2020-01-22 08:19:57.690198160 +0100
+++ /var/tmp/diff_new_pack.H9z1Bf/_new  2020-01-22 08:19:57.694198163 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package boost
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -94,6 +94,24 @@
 %endif
 %endif
 
+%if "@BUILD_FLAVOR@" == "gnu-openmpi3-hpc"
+%define build_base 0
+%define name_suffix openmpi3_hpc
+%define mpi_vers 3
+%define compiler_family gnu
+%define mpi_flavor openmpi
+%undefine c_f_ver
+%bcond_without hpc
+%bcond_without mpi
+%bcond_without python2
+%bcond_without python3
+%if %{with ringdisabled}
+ExclusiveArch:  do-not-build
+%else
+ExcludeArch:    s390x %{ix86} ppc64 ppc64le ia64 hppa
+%endif
+%endif
+
 %if "@BUILD_FLAVOR@" == "gnu-mvapich2-hpc"
 %define build_base 0
 %define name_suffix mvapich2_hpc
@@ -111,6 +129,23 @@
 %endif
 %endif
 
+%if "@BUILD_FLAVOR@" == "gnu-mpich-hpc"
+%define build_base 0
+%define name_suffix mpich
+%define compiler_family gnu
+%define mpi_flavor mpich
+%undefine c_f_ver
+%bcond_without hpc
+%bcond_without mpi
+%bcond_without python2
+%bcond_without python3
+%if %{with ringdisabled}
+ExclusiveArch:  do-not-build
+%else
+ExcludeArch:    s390x %{ix86} ppc64 ppc64le ia64 hppa
+%endif
+%endif
+
 # Python NumPy library is only available on Leap 42.1 OpenSUSE onward
 # and is not availble in SLE
 %if 0%{?suse_version} >= 1330 || 0%{?is_opensuse}
@@ -328,19 +363,6 @@
 the documentation packages (html, man or pdf).
 
 %if %{with hpc}
-%if ! %{with mpi}
-%package     -n %{package_name}-jam
-Summary:        A Boost Make Replacement
-Group:          Development/Tools/Building
-Provides:       hpc-boost-jam-impl = %{version}
-
-%description -n %{package_name}-jam
-Boost Jam is a build tool based on FTJam, which in turn is based on
-Perforce Jam. It contains significant improvements made to facilitate
-its use in the Boost Build System. This version is modularized so it 
-does not conflict with other versions, but the module must be used 
-before usage.
-%endif # ! mpi
 %package     -n %{package_name}-python3
 Summary:        Boost.MPI Python 3.x serialization library
 Group:          System/Libraries
@@ -1360,7 +1382,7 @@
 %if %{with python3}
 cp user-config.jam user-config-py3.jam
 # sed -i -e 's#//boost_python#//boost_python3#' ./user-config-py3.jam
-%{?!py3_abiflags: %define py3_abiflags m}
+%define py3_abiflags %(python3-config --abiflags)
 %{?!python3_version: %define python3_version %{py3_ver} }
 
 cat << EOF >> user-config-py3.jam
@@ -1553,8 +1575,10 @@
 
 %if %{build_base}
 mkdir -p %{buildroot}%{package_bindir}
+%if %{without hpc}
 install -m 755 b2 %{buildroot}%{package_bindir}/bjam
 ln -s bjam %{buildroot}%{package_bindir}/jam
+%endif
 
 # Remove exception library, but only if the symbols are not
 # actually used. For now, the only symbol that is linked is
@@ -1777,11 +1801,6 @@
 %files -n %{package_name}-devel
 %package_includedir
 %package_libdir/*.so
-# do not package jam/bjam when building with mpi
-%if ! %{with mpi}
-%files -n %{package_name}-jam
-%package_bindir
-%endif # ! with mpi
 %if %{with python2}
 %files -n %{package_name}-python2 
 %package_python2_sitearch

++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.H9z1Bf/_old  2020-01-22 08:19:57.762198199 +0100
+++ /var/tmp/diff_new_pack.H9z1Bf/_new  2020-01-22 08:19:57.762198199 +0100
@@ -1,7 +1,7 @@
 <multibuild>
-  <package>base</package>
-  <package>extra</package>
   <package>gnu-hpc</package>
   <package>gnu-openmpi2-hpc</package>
+  <package>gnu-openmpi3-hpc</package>
   <package>gnu-mvapich2-hpc</package>
+  <package>gnu-mpich-hpc</package>
 </multibuild>


Reply via email to