rpms/R-RScaLAPACK/devel R-RScaLAPACK-0.4.0-gcc4.patch, NONE, 1.1 R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch, NONE, 1.1 R-RScaLAPACK.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/R-RScaLAPACK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5379/devel

Modified Files:
	.cvsignore sources 
Added Files:
	R-RScaLAPACK-0.4.0-gcc4.patch 
	R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch R-RScaLAPACK.spec 
Log Message:
auto-import R-RScaLAPACK-0.4.0-2 on branch devel from R-RScaLAPACK-0.4.0-2.src.rpm

R-RScaLAPACK-0.4.0-gcc4.patch:

--- NEW FILE R-RScaLAPACK-0.4.0-gcc4.patch ---
--- R-RScaLAPACK-0.4.0/RScaLAPACK/src/Makefile.BAD	2005-04-18 21:54:06.000000000 -0500
+++ R-RScaLAPACK-0.4.0/RScaLAPACK/src/Makefile	2005-04-18 21:54:20.000000000 -0500
@@ -10,10 +10,10 @@
 all: CRDriver RScaLAPACK.so
 
 RScaLAPACK.so: $(PA_OBJECTS)
-	$(SHLIB_LINK) -o $@ $(PA_OBJECTS) $(ALL_LIBS) -lg2c $(ALL_CFLAGS) $(ALL_CPPFLAGS)
+	$(SHLIB_LINK) -o $@ $(PA_OBJECTS) $(ALL_LIBS) -lgfortran $(ALL_CFLAGS) $(ALL_CPPFLAGS)
 
 CRDriver: CRDriver.o $(CR_OBJECTS)
-	$(CC) CRDriver.o $(CR_OBJECTS) $(ALL_LIBS) $(ALL_CFLAGS) $(ALL_CPPFLAGS) -lg2c $(PKG_CFLAGS) -o $@
+	$(CC) CRDriver.o $(CR_OBJECTS) $(ALL_LIBS) $(ALL_CFLAGS) $(ALL_CPPFLAGS) -lgfortran $(PKG_CFLAGS) -o $@
 	cp CRDriver ../exec
 
 clean:

R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch:

--- NEW FILE R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch ---
--- R-RScaLAPACK-0.4.0/RScaLAPACK/configure.BAD	2005-04-18 19:14:57.000000000 -0500
+++ R-RScaLAPACK-0.4.0/RScaLAPACK/configure	2005-04-18 21:48:45.000000000 -0500
@@ -3550,7 +3550,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmpi  $LIBS"
+LIBS="-lmpi -ldl /usr/lib/liblam.a $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4170,13 +4170,13 @@
 fi
 
 
-echo "$as_me:$LINENO: checking for Cblacs_gridexit in -lblacs" >&5
-echo $ECHO_N "checking for Cblacs_gridexit in -lblacs... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for Cblacs_gridexit in -lmpiblacs" >&5
+echo $ECHO_N "checking for Cblacs_gridexit in -lmpiblacs... $ECHO_C" >&6
 if test "${ac_cv_lib_blacs_Cblacs_gridexit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lblacs  $LIBS"
+LIBS="/usr/lib/libmpiblacs.a -llam /usr/lib/libmpi.a /usr/lib/liblam.a -ldl $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4239,7 +4239,7 @@
 #define HAVE_LIBBLACS 1
 _ACEOF
 
-  LIBS="-lblacs $LIBS"
+  LIBS="/usr/lib/libmpiblacs.a -llam /usr/lib/libmpi.a /usr/lib/liblam.a -ldl $LIBS"
 
 else
 
@@ -4320,13 +4320,13 @@
 
 fi
 
-echo "$as_me:$LINENO: checking for Cblacs_pinfo in -lblacsCinit" >&5
-echo $ECHO_N "checking for Cblacs_pinfo in -lblacsCinit... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for Cblacs_pinfo in -lmpiblacsCinit" >&5
+echo $ECHO_N "checking for Cblacs_pinfo in -lmpiblacsCinit... $ECHO_C" >&6
 if test "${ac_cv_lib_blacsCinit_Cblacs_pinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lblacsCinit  $LIBS"
+LIBS="/usr/lib/libmpiblacsCinit.a $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4466,13 +4466,13 @@
 fi
 
 
-echo "$as_me:$LINENO: checking for blacs_pinfo__ in -lblacsF77init" >&5
-echo $ECHO_N "checking for blacs_pinfo__ in -lblacsF77init... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for blacs_pinfo__ in -lmpiblacsF77init" >&5
+echo $ECHO_N "checking for blacs_pinfo__ in -lmpiblacsF77init... $ECHO_C" >&6
 if test "${ac_cv_lib_blacsF77init_blacs_pinfo__+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lblacsF77init  $LIBS"
+LIBS="/usr/lib/libmpiblacsF77init.a /usr/lib/liblamf77mpi.a $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4535,7 +4535,7 @@
 #define HAVE_LIBBLACSF77INIT 1
 _ACEOF
 
-  LIBS="-lblacsF77init $LIBS"
+  LIBS="/usr/lib/libmpiblacsF77init.a /usr/lib/liblamf77mpi.a $LIBS"
 
 else
 
@@ -4774,7 +4774,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lscalapack  $LIBS"
+LIBS="-lscalapack $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF


--- NEW FILE R-RScaLAPACK.spec ---
%define packname RScaLAPACK

Name: R-%{packname}
Version: 0.4.0
Release: 2
Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
License: Freely distributable
URL: http://cran.r-project.org/contrib
Group: Applications/Engineering
Summary: An interface to perform parallel computation on linear algebra problems using ScaLAPACK
BuildRequires: R-devel, tetex-latex
BuildRequires: gcc-gfortran
Requires: R, scalapack
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch
Patch1: R-RScaLAPACK-0.4.0-gcc4.patch

%description
R package:
An R add-on package capable of carrying out parallel computation through 
a single function call from the R environment. It uses the high-performance 
ScaLAPACK library for the linear algebra computations.

%prep
%setup -T -c -a 0
%patch0 -p1
%patch1 -p1

%build
cp %{packname}/DESCRIPTION .

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library
%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
%{_bindir}/R CMD check %{packname}
test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)
rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css

%clean
rm -rf $RPM_BUILD_ROOT

%post
%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists
cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt

%postun
%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists
cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt

%files
%doc DESCRIPTION
%{_libdir}/R/library/%{packname}

%changelog
* Tue Apr 19 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.4.0-2
- add gcc-gfortran as a BuildRequires (gcc-g77 for fc3)

* Mon Apr 18 2005 Tom "spot" Callaway <tcallawa at redhat.com> 
- Initial package creation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Apr 2005 17:47:26 -0000	1.1
+++ .cvsignore	24 Apr 2005 17:48:06 -0000	1.2
@@ -0,0 +1 @@
+RScaLAPACK_0.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Apr 2005 17:47:26 -0000	1.1
+++ sources	24 Apr 2005 17:48:06 -0000	1.2
@@ -0,0 +1 @@
+e086b79d25d1c5d1eba377b632609d67  RScaLAPACK_0.4.0.tar.gz