From c21b53d09b99212311510af6845a91cd5748e814 Mon Sep 17 00:00:00 2001 From: Yinsist Date: Fri, 3 May 2024 06:55:27 +0000 Subject: [PATCH] first check if Valgrind supports the architecture --- R.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/R.spec b/R.spec index 0ef67d6..2ae5639 100644 --- a/R.spec +++ b/R.spec @@ -8,7 +8,7 @@ Name: R Version: %{major_version}.%{minor_version}.%{patch_version} -Release: 3 +Release: 4 Summary: A language for data analysis and graphics License: AGPL-3.0 and Artistic-2.0 and BSD-2-Clause and BSD-3-Clause and GPL-2.0 and GPL-3.0 and LGPL-2.1 and LGPL-3.0 and MIT and CC-BY-SA-4.0 URL: http://www.r-project.org @@ -16,7 +16,10 @@ Source0: https://cran.r-project.org/src/base/R-4/R-%{version}.tar.gz Patch0: allow-libcurl-v8.patch BuildRequires: gcc-gfortran gcc-c++ texinfo-tex libpng-devel libjpeg-devel readline-devel libicu-devel less tcl-devel -BuildRequires: ncurses-devel pcre-devel zlib-devel pcre2-devel libcurl-devel valgrind-devel java-openjdk tk-devel +BuildRequires: ncurses-devel pcre-devel zlib-devel pcre2-devel libcurl-devel java-openjdk tk-devel +%ifarch "%{valgrind_arches}" +BuildRequires: valgrind-devel +%endif BuildRequires: tre-devel autoconf automake libtool openblas-devel pango-devel xz-devel libSM-devel libX11-devel libICE-devel BuildRequires: libXt-devel bzip2-devel libXmu-devel cairo-devel libtiff-devel tex(inconsolata.sty) tex(upquote.sty) tex(latex) @@ -237,7 +240,9 @@ export FCFLAGS="%{optflags}" (%configure \ --with-system-tre \ + %ifarch "%{valgrind_arches}" --with-system-valgrind-headers \ + %endif --with-lapack \ --with-blas \ --with-tcl-config=%{_libdir}/tclConfig.sh \ @@ -735,6 +740,9 @@ R CMD javareconf \ %changelog +* Fri May 3 2024 yinsist - 4.0.5-4 +- Valgrind does not support certain architectures like RISC-V, Before depending on Valgrind, first check if Valgrind supports the architecture + * Mon Apr 8 2024 laokz - 4.0.5-3 - riscv64: disable %check due to NaN issue