Hello community, here is the log from the commit of package openmpi1 for openSUSE:Factory checked in at 2020-06-10 00:50:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openmpi1 (Old) and /work/SRC/openSUSE:Factory/.openmpi1.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openmpi1" Wed Jun 10 00:50:29 2020 rev:5 rq:812844 version:1.10.7 Changes: -------- --- /work/SRC/openSUSE:Factory/openmpi1/openmpi1.changes 2020-03-21 00:00:42.361071690 +0100 +++ /work/SRC/openSUSE:Factory/.openmpi1.new.3606/openmpi1.changes 2020-06-10 00:50:31.787276750 +0200 @@ -1,0 +2,5 @@ +Tue Jun 9 08:47:45 UTC 2020 - Nicolas Morey-Chaisemartin <[email protected]> + +- Add ompi-mca-fix-duplicated-symbol.patch to fix compilation with GCC10 + +------------------------------------------------------------------- New: ---- ompi-mca-fix-duplicated-symbol.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmpi1.spec ++++++ --- /var/tmp/diff_new_pack.zeXvtn/_old 2020-06-10 00:50:32.551278748 +0200 +++ /var/tmp/diff_new_pack.zeXvtn/_new 2020-06-10 00:50:32.551278748 +0200 @@ -127,6 +127,7 @@ Patch4: openmpi-etc-files.patch Patch5: openmpi-btl-openib-backport-device-params-from-master.patch Patch6: reproducible.patch +Patch7: ompi-mca-fix-duplicated-symbol.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -388,6 +389,7 @@ %patch3 -p1 %patch4 %patch5 +%patch7 %if %{without hpc} cat > %{_sourcedir}/baselibs.conf <<EOF ++++++ ompi-mca-fix-duplicated-symbol.patch ++++++ commit e1f77cff04e2403275fbf119fe2685171511aa55 Author: Nicolas Morey-Chaisemartin <[email protected]> Date: Tue Jun 9 10:46:17 2020 +0200 ompi mca: fix duplicated symbol Add missing extern to avoid duplicated symbol error with GCC10 /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/bin/ld: .libs/mtl_psm_component.o (symbol from plugin): in function `mca_mtl_psm_component': (.text+0x0): multiple definition of `mca_mtl_psm_component'; .libs/mtl_psm.o (symbol from plugin):(.text+0x0): first defined here /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/bin/ld: .libs/mtl_psm_endpoint.o (symbol from plugin): in function `mca_mtl_psm_endpoint_t_class': (.text+0x0): multiple definition of `mca_mtl_psm_component'; .libs/mtl_psm.o (symbol from plugin):(.text+0x0): first defined here /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/bin/ld: .libs/mtl_psm_probe.o (symbol from plugin): in function `ompi_mtl_psm_iprobe': (.text+0x0): multiple definition of `mca_mtl_psm_component'; .libs/mtl_psm.o (symbol from plugin):(.text+0x0): first defined here /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/bin/ld: .libs/mtl_psm_recv.o (symbol from plugin): in function `ompi_mtl_psm_irecv': (.text+0x0): multiple definition of `mca_mtl_psm_component'; .libs/mtl_psm.o (symbol from plugin):(.text+0x0): first defined here /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/bin/ld: .libs/mtl_psm_send.o (symbol from plugin): in function `ompi_mtl_psm_send': (.text+0x0): multiple definition of `mca_mtl_psm_component'; .libs/mtl_psm.o (symbol from plugin):(.text+0x0): first defined here Signed-off-by: Nicolas Morey-Chaisemartin <[email protected]> diff --git ompi/mca/mtl/psm/mtl_psm_types.h ompi/mca/mtl/psm/mtl_psm_types.h index 734825ce6019..799f6acdf065 100644 --- ompi/mca/mtl/psm/mtl_psm_types.h +++ ompi/mca/mtl/psm/mtl_psm_types.h @@ -70,7 +70,7 @@ struct mca_mtl_psm_component_t { }; typedef struct mca_mtl_psm_component_t mca_mtl_psm_component_t; -OMPI_DECLSPEC mca_mtl_psm_component_t mca_mtl_psm_component; +extern OMPI_DECLSPEC mca_mtl_psm_component_t mca_mtl_psm_component; #define PSM_MAKE_MQTAG(ctxt,rank,utag) \ ( (((ctxt)&0xffffULL)<<48)| (((rank)&0xffffULL)<<32)| \
