From 7b53f47a5bf0f1ca550b72f73ab7d95a8dcf469ca7f73b7991f17c1058c65c0c Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Tue, 9 Jun 2020 21:03:52 +0000 Subject: [PATCH] Accepting request 813052 from home:NMoreyChaisemartin:branches:science:HPC - Update to v10.10.1.0.35 - No changelog available - Add workaround-bsc-1172755.patch to fix compilation with LTO enabled. OBS-URL: https://build.opensuse.org/request/show/813052 OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-ff?expand=0&rev=55 --- _service | 2 +- opa-ff-10.10.1.0.35.0.bd8b24a56fcb.tar.gz | 3 +++ opa-ff-10.9.3.1.1.0.73b52d17053f.tar.gz | 3 --- opa-ff.changes | 7 +++++++ opa-ff.spec | 12 +++++++----- workaround-bsc-1172755.patch | 24 +++++++++++++++++++++++ 6 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 opa-ff-10.10.1.0.35.0.bd8b24a56fcb.tar.gz delete mode 100644 opa-ff-10.9.3.1.1.0.73b52d17053f.tar.gz create mode 100644 workaround-bsc-1172755.patch diff --git a/_service b/_service index 05448ba..6b27e4a 100644 --- a/_service +++ b/_service @@ -8,7 +8,7 @@ @PARENT_TAG@.@TAG_OFFSET@.%h v(.*) \1 - 73b52d17053f77cd00ed30cd28c39f0b683795be + bd8b24a56fcb09dcf85443a487b832aad42654c2 opa-ff*.tar diff --git a/opa-ff-10.10.1.0.35.0.bd8b24a56fcb.tar.gz b/opa-ff-10.10.1.0.35.0.bd8b24a56fcb.tar.gz new file mode 100644 index 0000000..06494fd --- /dev/null +++ b/opa-ff-10.10.1.0.35.0.bd8b24a56fcb.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90f9db5ac27faead98008373fd6deae5606c56745329dee0ab025c09fe27611b +size 2941908 diff --git a/opa-ff-10.9.3.1.1.0.73b52d17053f.tar.gz b/opa-ff-10.9.3.1.1.0.73b52d17053f.tar.gz deleted file mode 100644 index 5aaf52b..0000000 --- a/opa-ff-10.9.3.1.1.0.73b52d17053f.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dad0495ce6c542935c16cd94e66da532cfccf31d916a9d38d1d66cd921b69dda -size 2944463 diff --git a/opa-ff.changes b/opa-ff.changes index 92196b8..29742c3 100644 --- a/opa-ff.changes +++ b/opa-ff.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 9 19:33:56 UTC 2020 - Nicolas Morey-Chaisemartin + +- Update to v10.10.1.0.35 + - No changelog available +- Add workaround-bsc-1172755.patch to fix compilation with LTO enabled. + ------------------------------------------------------------------- Fri Sep 6 14:32:59 UTC 2019 - Nicolas Morey-Chaisemartin diff --git a/opa-ff.spec b/opa-ff.spec index 249e313..4bb0850 100644 --- a/opa-ff.spec +++ b/opa-ff.spec @@ -1,7 +1,7 @@ # # spec file for package opa-ff # -# 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 @@ -16,7 +16,7 @@ # -%define git_ver .1.1.0.73b52d17053f +%define git_ver .0.35.0.bd8b24a56fcb %define opamgt_major 0 %define opasadb_major 1_0_0 @@ -24,16 +24,17 @@ %define opasysconfdir %{_sysconfdir}/opa/ Name: opa-ff -Version: 10.9.3 +Version: 10.10.1 Release: 0 Summary: Intel Omni-Path basic tools and libraries for fabric managment License: BSD-3-Clause OR GPL-2.0-only Group: Productivity/Networking/System -Url: https://github.com/intel/opa-ff +URL: https://github.com/intel/opa-ff Source0: %{name}-%{version}%{git_ver}.tar.gz Source1: opa-ff.rpmlintrc Patch1: opa-ff-add-shebang-for-exp-files.patch Patch2: opa-ff-suse-build-fixes.patch +Patch3: workaround-bsc-1172755.patch BuildRequires: gcc-c++ BuildRequires: infiniband-diags-devel BuildRequires: libexpat-devel @@ -127,6 +128,7 @@ Tools for parsing information from provided snapshot files and issuing packets t %setup -q -n %{name}-%{version}%{git_ver} %patch1 %patch2 +%patch3 %build export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-address-of-packed-member" @@ -178,7 +180,7 @@ cp -t %{buildroot}%{pseudo_opt}/samples/opamgt $opamgt_examples cd ../bin cp -t %{buildroot}/%{pseudo_opt}/tools/ ${ff_tools_opt} -cp -t %{buildroot}/%{pseudo_opt}/tools/ ${opasnapconfig_bin} +#cp -t %{buildroot}/%{pseudo_opt}/tools/ ${opasnapconfig_bin} cd ../fastfabric cp -t %{buildroot}%{_sbindir} ${ff_tools_sbin} diff --git a/workaround-bsc-1172755.patch b/workaround-bsc-1172755.patch new file mode 100644 index 0000000..861714e --- /dev/null +++ b/workaround-bsc-1172755.patch @@ -0,0 +1,24 @@ +commit c477cf2496c1ec83a63a28629a4fdf0c2a10d458 +Author: Nicolas Morey-Chaisemartin +Date: Tue Jun 9 22:57:52 2020 +0200 + + workaround bsc 1172755 + + GCC bug causes compilation to fail with LTO enabled. + Workaround the issue by changing mcmodel + + Signed-off-by: Nicolas Morey-Chaisemartin + +diff --git IbaTools/stream/Makefile IbaTools/stream/Makefile +index 7ed670d19fee..6eb0a334c8a9 100644 +--- IbaTools/stream/Makefile ++++ IbaTools/stream/Makefile +@@ -110,7 +110,7 @@ INCLUDE_SUBDIR = + # (in addition to LOCALDEPLIBS) + #LOCAL_LIB_DIRS = User library directories for libpaths [Empty] + +-CLOCAL = $(CPIE) -mcmodel=medium -DSTREAM_ARRAY_SIZE=353783808 -fopenmp ++CLOCAL = $(CPIE) -mcmodel=large -DSTREAM_ARRAY_SIZE=353783808 -fopenmp + LDLOCAL = -fopenmp + + # Include Make Rules definitions and rules