rpm/clFFT
SHA256
1
0
Fork 0
forked from pool/clFFT
Code Pull Requests Activity

Accepting request 903571 from home:badshah400:gcc11fix

Browse Source 
- Add clFFT-avoid-rvalue-address.patch: Fix building with gcc11 (which is stricter about referencing rvalue addresses) by using ostringstream object directly rather its pointer [gh#clMathLibraries/clFFT#237].
- Add opencl-headers and pkgconfig(OpenCL) to -devel package Requires as these are referenced by clFFT headers and library.
- Use %license for LICENSE file.

OBS-URL: https://build.opensuse.org/request/show/903571
OBS-URL: https://build.opensuse.org/package/show/science/clFFT?expand=0&rev=13
This commit is contained in:
Martin Hauke 2021-07-02 17:11:56 +00:00 committed by Git OBS Bridge
parent 81ff664f61
commit 71045aefd9
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clFFT-avoid-rvalue-address.patch Normal file
View File

@ -0,0 +1,15 @@
Index: clFFT-2.12.2/src/library/generator.transpose.cpp
===================================================================
--- clFFT-2.12.2.orig/src/library/generator.transpose.cpp
+++ clFFT-2.12.2/src/library/generator.transpose.cpp
@@ -1089,8 +1089,8 @@ clfftStatus genSwapKernelGeneral(const F
//std::string funcName = "swap_nonsquare_" + std::to_string(smaller_dim) + "_" + std::to_string(dim_ratio);
std::string funcName = "swap_nonsquare_";
- std::string smaller_dim_str = static_cast<std::ostringstream*>(&(std::ostringstream() << smaller_dim))->str();
- std::string dim_ratio_str = static_cast<std::ostringstream*>(&(std::ostringstream() << dim_ratio))->str();
+ std::string smaller_dim_str = (std::ostringstream() << smaller_dim).str();
+ std::string dim_ratio_str = (std::ostringstream() << dim_ratio).str();
if(params.fft_N[0] > params.fft_N[1])
funcName = funcName + smaller_dim_str + "_" + dim_ratio_str;
else

11
clFFT.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Jul 1 14:28:59 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
- Add clFFT-avoid-rvalue-address.patch: Fix building with gcc11
(which is stricter about referencing rvalue addresses) by using
ostringstream object directly rather its pointer
[gh#clMathLibraries/clFFT#237].
- Add opencl-headers and pkgconfig(OpenCL) to -devel package
Requires as these are referenced by clFFT headers and library.
- Use %license for LICENSE file.
-------------------------------------------------------------------
Wed Nov 20 23:15:31 UTC 2019 - Simon Lees <sflees@suse.de>

19
clFFT.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package clFFT
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2017, Martin Hauke <mardnh@gmx.de>
#
# All modifications and additions to the file contributed by third parties
@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -26,12 +26,14 @@ Release: 0
Summary: OpenCL FFT library
License: Apache-2.0
Group: Productivity/Scientific/Math
Url: https://github.com/clMathLibraries/clFFT
URL: https://github.com/clMathLibraries/clFFT
#Git-Clone: https://github.com/clMathLibraries/clFFT.git
Source: https://github.com/clMathLibraries/clFFT/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: clFFT-client.1
Patch0: fix-client-no-symlink.patch
Patch1: clFFT-fix-aarm64.patch
# PATCH-FIX-UPSTREAM clFFT-avoid-rvalue-address.patch gh#clMathLibraries/clFFT#237 badshah400@gmail.com -- Fix building with gcc11 (which is stricter about referencing rvalue addresses) by using ostringstream object directly rather its pointer
Patch2: clFFT-avoid-rvalue-address.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: opencl-headers
@ -63,6 +65,8 @@ Summary: Development files for libclfft
Group: Development/Libraries/C and C++
Requires: %{libclfft} = %{version}
Requires: %{libtimer} = %{version}
Requires: opencl-headers
Requires: pkgconfig(OpenCL)
%description devel
Libraries and header files for developing applications that want to
@ -112,6 +116,9 @@ This subpackage provides shared libStatTimer library
%ifarch aarch64
%patch1 -p1
%endif
%if 0%{?suse_version} >= 1550
%patch2 -p1
%endif
%build
cd src
@ -141,11 +148,13 @@ install -Dpm0644 %{SOURCE1} \
%{_mandir}/man1/clFFT-client.1%{ext_man}
%files -n %{libclfft}
%doc CHANGELOG LICENSE NOTICE ReleaseNotes.txt
%license LICENSE
%doc CHANGELOG NOTICE ReleaseNotes.txt
%{_libdir}/libclFFT.so.%{sover}*
%files -n %{libtimer}
%doc CHANGELOG LICENSE NOTICE ReleaseNotes.txt
%license LICENSE
%doc CHANGELOG NOTICE ReleaseNotes.txt
%{_libdir}/libStatTimer.so.%{sover}*
%files devel