fix fortran compiler error on EL-4
This commit is contained in:
parent
4fe5e534d2
commit
5d638a86e4
27
R.spec
27
R.spec
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
Name: R
|
Name: R
|
||||||
Version: 2.8.1
|
Version: 2.8.1
|
||||||
Release: 2%{?dist}.2
|
Release: 3%{?dist}
|
||||||
Summary: A language for data analysis and graphics
|
Summary: A language for data analysis and graphics
|
||||||
URL: http://www.r-project.org
|
URL: http://www.r-project.org
|
||||||
Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
|
Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
|
||||||
|
@ -157,7 +157,6 @@ echo 'R_LIBS=${R_LIBS-'"'%{_libdir}/R/library:%{_datadir}/R/library'"'}' >> etc/
|
||||||
export R_PDFVIEWER="%{_bindir}/ggv"
|
export R_PDFVIEWER="%{_bindir}/ggv"
|
||||||
export R_PRINTCMD="lpr"
|
export R_PRINTCMD="lpr"
|
||||||
export R_BROWSER="%{_bindir}/firefox"
|
export R_BROWSER="%{_bindir}/firefox"
|
||||||
export F77="g77"
|
|
||||||
# Only broken on EL-4, ppc
|
# Only broken on EL-4, ppc
|
||||||
%ifarch ppc
|
%ifarch ppc
|
||||||
export CPICFLAGS="-fPIC"
|
export CPICFLAGS="-fPIC"
|
||||||
|
@ -170,25 +169,25 @@ case "%{_target_cpu}" in
|
||||||
x86_64|mips64|ppc64|powerpc64|sparc64|s390x)
|
x86_64|mips64|ppc64|powerpc64|sparc64|s390x)
|
||||||
export CC="gcc -m64"
|
export CC="gcc -m64"
|
||||||
export CXX="g++ -m64"
|
export CXX="g++ -m64"
|
||||||
export F77="gfortran -m64"
|
export F77="g77 -m64"
|
||||||
export FC="gfortran -m64"
|
export FC="g77 -m64"
|
||||||
;;
|
;;
|
||||||
ia64|alpha|sh*)
|
ia64|alpha|sh*)
|
||||||
export CC="gcc"
|
export CC="gcc"
|
||||||
export CXX="g++"
|
export CXX="g++"
|
||||||
export F77="gfortran"
|
export F77="g77"
|
||||||
export FC="gfortran"
|
export FC="g77"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
export CC="gcc -m32"
|
export CC="gcc -m32"
|
||||||
export CXX="g++ -m32"
|
export CXX="g++ -m32"
|
||||||
export F77="gfortran -m32"
|
export F77="g77 -m32"
|
||||||
export FC="gfortran -m32"
|
export FC="g77 -m32"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
export FCFLAGS="%{optflags}"
|
export FCFLAGS="%{optflags}"
|
||||||
%configure \
|
( %configure \
|
||||||
--with-system-zlib --with-system-bzlib --with-system-pcre \
|
--with-system-zlib --with-system-bzlib --with-system-pcre \
|
||||||
--with-lapack \
|
--with-lapack \
|
||||||
--with-tcl-config=%{_libdir}/tclConfig.sh \
|
--with-tcl-config=%{_libdir}/tclConfig.sh \
|
||||||
|
@ -196,11 +195,8 @@ export FCFLAGS="%{optflags}"
|
||||||
--enable-R-shlib \
|
--enable-R-shlib \
|
||||||
rdocdir=%{_docdir}/R-%{version} \
|
rdocdir=%{_docdir}/R-%{version} \
|
||||||
rincludedir=%{_includedir}/R \
|
rincludedir=%{_includedir}/R \
|
||||||
rsharedir=%{_datadir}/R
|
rsharedir=%{_datadir}/R) \
|
||||||
# ) \
|
| grep -A30 'R is now' - > CAPABILITIES
|
||||||
# | grep -A30 'R is now' - > CAPABILITIES
|
|
||||||
cat config.log
|
|
||||||
BARF
|
|
||||||
make
|
make
|
||||||
(cd src/nmath/standalone; make)
|
(cd src/nmath/standalone; make)
|
||||||
#make check-all
|
#make check-all
|
||||||
|
@ -336,6 +332,9 @@ fi
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 4 2009 Tom "spot" Callaway <tcallawa@redhat.com> 2.8.1-3
|
||||||
|
- fix fortran compiler error on EL-4
|
||||||
|
|
||||||
* Wed Mar 4 2009 Tom "spot" Callaway <tcallawa@redhat.com> 2.8.1-2
|
* Wed Mar 4 2009 Tom "spot" Callaway <tcallawa@redhat.com> 2.8.1-2
|
||||||
- fix R-make-search-index.sh (bz 487022)
|
- fix R-make-search-index.sh (bz 487022)
|
||||||
- fix libRmath requires to need V-R (thanks to Martyn Plummer)
|
- fix libRmath requires to need V-R (thanks to Martyn Plummer)
|
||||||
|
|
Loading…
Reference in New Issue