rpms
/
R
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix LTO flag once and for all (thanks, Mattias) 

Let R find its way into Java instead of specifying too many possible paths
This commit is contained in:
Iñaki Úcar 2022-11-05 09:27:32 +01:00
parent 57041b5b7a
commit b01786f9fe
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
R.spec
View File

@ -22,7 +22,7 @@
%global _lto_cflags %nil
%endif
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
%if 0%{?fedora} >= 33 || (0%{?rhel} && 0%{?rhel} < 9)
%global blaslib flexiblas
%global blasvar %{nil}
%else
@ -36,7 +36,7 @@
Name: R
Version: %{major_version}.%{minor_version}.%{patch_version}
Release: 2%{?dist}
Release: 3%{?dist}
Summary: A language for data analysis and graphics
License: GPLv2+
@ -353,15 +353,7 @@ export R_PRINTCMD="lpr"
export R_BROWSER="%{_bindir}/xdg-open"
%ifarch %{java_arches}
%ifarch x86_64
%define java_arch amd64
%else
%define java_arch %{_arch}
%endif
export JAVA_HOME=%{_jvmdir}/jre
export JAVA_CPPFLAGS="-I%{_jvmdir}/java/include -I%{_jvmdir}/java/include/linux"
export JAVA_LIBS="-L%{_jvmdir}/jre/lib/%{java_arch}/server -L%{_jvmdir}/jre/lib/%{java_arch} -L%{_jvmdir}/java/lib/%{java_arch} -L%{_jvmdir}/jre/lib/server -L/usr/java/packages/lib/%{java_arch} -L/lib -L/usr/lib -ljvm"
export JAVA_LD_LIBRARY_PATH=%{_jvmdir}/jre/lib/%{java_arch}/server:%{_jvmdir}/jre/lib/%{java_arch}:%{_jvmdir}/java/lib/%{java_arch}:%{_jvmdir}/jre/lib/server:/usr/java/packages/lib/%{java_arch}:/lib:/usr/lib
%endif
%if "%{blaslib}" == "flexiblas"
@ -838,6 +830,10 @@ fi
%{_libdir}/libRmath.a
%changelog
* Sat Nov 05 2022 Iñaki Úcar <iucar@fedoraproject.org> - 4.2.2-3
- Fix LTO flag once and for all (thanks, Mattias)
- Let R find its way into Java instead of specifying too many possible paths
* Fri Nov 04 2022 Iñaki Úcar <iucar@fedoraproject.org> - 4.2.2-2
- Move Java configuration to the build phase
- Remove javareconf from posttrans scriptlets