fix sh compile, bz 464055

This commit is contained in:
Tom Callaway 2008-10-16 20:45:20 +00:00
parent 0672b69fcb
commit 98300c8333
2 changed files with 18 additions and 2 deletions

View File

@ -0,0 +1,11 @@
--- R-2.7.2/configure.org 2008-09-25 15:00:20.000000000 +0900
+++ R-2.7.2/configure 2008-09-25 15:00:35.000000000 +0900
@@ -26995,7 +26995,7 @@
;;
# Ignore these flags.
- -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
+ -little | -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
;;
-lkernel32)
test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"

9
R.spec
View File

@ -1,6 +1,6 @@
Name: R
Version: 2.7.2
Release: 1%{?dist}
Release: 2%{?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-2/R-%{version}.tar.gz
@ -9,6 +9,7 @@ Source2: R-make-search-index.sh
# Sent upstream:
# http://bugs.r-project.org/cgi-bin/R/incoming?id=12636
Patch0: R-2.7.1-javareconf-tmpfix.patch
Patch1: R-2.7.2-filter_asoption.patch
License: GPLv2+
Group: Applications/Engineering
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -103,6 +104,7 @@ and header files.
%prep
%setup -q
%patch0 -p1 -b .javareconf-tmpfix
%patch1 -p1 -b .filter-little-out
# Filter false positive provides.
cat <<EOF > %{name}-prov
@ -137,7 +139,7 @@ case "%{_target_cpu}" in
export F77="gfortran -m64"
export FC="gfortran -m64"
;;
ia64|alpha)
ia64|alpha|sh*)
export CC="gcc"
export CXX="g++"
export F77="gfortran"
@ -287,6 +289,9 @@ fi
/sbin/ldconfig
%changelog
* Thu Oct 16 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.7.2-2
- fix sh compile (bz 464055)
* Fri Aug 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.7.2-1
- update to 2.7.2
- fix spec for alpha compile (bz 458931)