Accepting request 885361 from home:marxin:branches:science
- Add disable-Wmisleading-indentation.patch as a temporary workaround for https://github.com/DrTimothyAldenDavis/SuiteSparse/issues/84 that will be fixed in the next release (boo#1183575). OBS-URL: https://build.opensuse.org/request/show/885361 OBS-URL: https://build.opensuse.org/package/show/science/suitesparse?expand=0&rev=34
This commit is contained in:
parent
740147ac1d
commit
239094eefb
26
disable-Wmisleading-indentation.patch
Normal file
26
disable-Wmisleading-indentation.patch
Normal file
@ -0,0 +1,26 @@
|
||||
diff --git a/GraphBLAS/Demo/Include/graphblas_demos.h b/GraphBLAS/Demo/Include/graphblas_demos.h
|
||||
index 62809df..333c0b3 100644
|
||||
--- a/GraphBLAS/Demo/Include/graphblas_demos.h
|
||||
+++ b/GraphBLAS/Demo/Include/graphblas_demos.h
|
||||
@@ -25,8 +25,6 @@
|
||||
#pragma GCC diagnostic ignored "-Wint-in-bool-context"
|
||||
#pragma GCC diagnostic ignored "-Wformat-truncation="
|
||||
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
|
||||
-// enable these warnings as errors
|
||||
-#pragma GCC diagnostic error "-Wmisleading-indentation"
|
||||
#endif
|
||||
|
||||
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
|
||||
diff --git a/GraphBLAS/Source/GB_warnings.h b/GraphBLAS/Source/GB_warnings.h
|
||||
index 9591b84..cefc366 100644
|
||||
--- a/GraphBLAS/Source/GB_warnings.h
|
||||
+++ b/GraphBLAS/Source/GB_warnings.h
|
||||
@@ -56,8 +56,6 @@
|
||||
#pragma GCC diagnostic ignored "-Wint-in-bool-context"
|
||||
#pragma GCC diagnostic ignored "-Wformat-truncation="
|
||||
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
|
||||
-// enable these warnings as errors
|
||||
-#pragma GCC diagnostic error "-Wmisleading-indentation"
|
||||
#endif
|
||||
|
||||
// disable warnings from -Wall -Wextra -Wpendantic
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 7 06:18:07 UTC 2021 - Martin Liška <mliska@suse.cz>
|
||||
|
||||
- Add disable-Wmisleading-indentation.patch as a temporary workaround
|
||||
for https://github.com/DrTimothyAldenDavis/SuiteSparse/issues/84
|
||||
that will be fixed in the next release (boo#1183575).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 16 07:34:25 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||
|
||||
|
@ -15,6 +15,7 @@
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%ifarch %{arm}
|
||||
%define _lto_cflags %{nil}
|
||||
%endif
|
||||
@ -36,6 +37,8 @@ Source0: https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v%{ve
|
||||
Source2: %{name}-rpmlintrc
|
||||
# PATCH-FIX-OPENSUSE build_csparse_shared.patch -- Build CSparse as a shared library
|
||||
Patch1: build_csparse_shared.patch
|
||||
# PATCH-FIX-OPENSUSE disable-Wmisleading-indentation.patch bsc#1183575
|
||||
Patch2: disable-Wmisleading-indentation.patch
|
||||
Patch775418: bnc775418-enable-SuiteSparse_time-symbol.patch
|
||||
%if 0%{?suse_version} < 1500
|
||||
BuildRequires: gcc7
|
||||
@ -587,6 +590,7 @@ SuiteSparse_config is part of the SuiteSparse sparse matrix suite.
|
||||
%prep
|
||||
%setup -q -n SuiteSparse-%{version}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
sed 's/^CHOLMOD_CONFIG =.*/CHOLMOD_CONFIG = -DNPARTITION/' -i SuiteSparse_config/SuiteSparse_config.mk
|
||||
%if %{without openblas}
|
||||
sed 's/-lopenblas/-lblas/' -i SuiteSparse_config/SuiteSparse_config.mk
|
||||
@ -784,9 +788,9 @@ popd
|
||||
|
||||
%files -n %{cholmodlib}
|
||||
%doc CHOLMOD/README.txt
|
||||
%doc CHOLMOD/Doc/CHOLMOD_UserGuide.pdf
|
||||
%doc CHOLMOD/Doc/CHOLMOD_UserGuide.pdf
|
||||
%license CHOLMOD/Doc/ChangeLog CHOLMOD/Doc/License.txt
|
||||
%license CHOLMOD/Cholesky/lesser.txt
|
||||
%license CHOLMOD/Cholesky/lesser.txt
|
||||
%license CHOLMOD/MatrixOps/gpl.txt
|
||||
%{_libdir}/libcholmod.so.*
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user