fix ldpaths for zlibhack
This commit is contained in:
parent
e1fee7a8d0
commit
2745d0b728
8
R.spec
8
R.spec
@ -82,7 +82,7 @@
|
||||
|
||||
Name: R
|
||||
Version: 3.3.0
|
||||
Release: 8%{?dist}
|
||||
Release: 9%{?dist}
|
||||
Summary: A language for data analysis and graphics
|
||||
URL: http://www.r-project.org
|
||||
Source0: ftp://cran.r-project.org/pub/R/src/base/R-3/R-%{version}.tar.gz
|
||||
@ -682,6 +682,9 @@ sed -i 's|-I%{_builddir}/%{name}-%{version}/zlib-%{zlibv}/target%{_includedir} -
|
||||
sed -i 's|-ldl -lpthread .* -lldap -lz||g' %{buildroot}%{_libdir}/R/etc/Makeconf
|
||||
#el5 FLIBS
|
||||
sed -i 's|-ldl -lpthread .* -lldap||g' %{buildroot}%{_libdir}/R/etc/Makeconf
|
||||
# ldpaths
|
||||
sed -i 's|:/builddir/build/BUILD/R-%{version}/curl-%{curlv}/target%{_libdir}/:/builddir/build/BUILD/R-%{version}/curl-%{curlv}/target%{_libdir}||g' %{buildroot}%{_libdir}/R/etc/ldpaths
|
||||
sed -i 's|/builddir/build/BUILD/R-%{version}/curl-%{curlv}/target%{_libdir}/:/builddir/build/BUILD/R-%{version}/curl-%{curlv}/target%{_libdir}||g' %{buildroot}%{_libdir}/R/etc/ldpaths
|
||||
%endif
|
||||
|
||||
%check
|
||||
@ -1131,6 +1134,9 @@ R CMD javareconf \
|
||||
%{_libdir}/libRmath.a
|
||||
|
||||
%changelog
|
||||
* Sat Jun 11 2016 Tom Callaway <spot@fedoraproject.org> - 3.3.0-9
|
||||
- fix ldpaths for zlibhack
|
||||
|
||||
* Thu Jun 9 2016 Tom Callaway <spot@fedoraproject.org> - 3.3.0-8
|
||||
- fix FLIBS cleanup for el5
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user