rpms/R-RScaLAPACK/devel R-RScaLAPACK-0.6.1-AC_MSG_ERROR.patch, NONE, 1.1 R-RScaLAPACK-0.6.1-atlas.patch, NONE, 1.1 R-RScaLAPACK-0.6.1-blas.patch, NONE, 1.1 R-RScaLAPACK-0.6.1-configurefix.patch, NONE, 1.1 R-RScaLAPACK-0.6.1-fflags.patch, NONE, 1.1 R-RScaLAPACK-0.6.1-lapack.patch, NONE, 1.1 R-RScaLAPACK-0.6.1-mpiblacs.patch, NONE, 1.1 R-RScaLAPACK-0.6.1-mpicc.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 R-RScaLAPACK.spec, 1.34, 1.35 sources, 1.3, 1.4
Tom Callaway
spot at fedoraproject.org
Thu Jan 14 22:49:10 UTC 2010
Author: spot
Update of /cvs/pkgs/rpms/R-RScaLAPACK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17106
Modified Files:
.cvsignore R-RScaLAPACK.spec sources
Added Files:
R-RScaLAPACK-0.6.1-AC_MSG_ERROR.patch
R-RScaLAPACK-0.6.1-atlas.patch R-RScaLAPACK-0.6.1-blas.patch
R-RScaLAPACK-0.6.1-configurefix.patch
R-RScaLAPACK-0.6.1-fflags.patch
R-RScaLAPACK-0.6.1-lapack.patch
R-RScaLAPACK-0.6.1-mpiblacs.patch
R-RScaLAPACK-0.6.1-mpicc.patch
Log Message:
apply tons and tons of glue, update to 0.6.1
R-RScaLAPACK-0.6.1-AC_MSG_ERROR.patch:
configure.in | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
--- NEW FILE R-RScaLAPACK-0.6.1-AC_MSG_ERROR.patch ---
diff -up RScaLAPACK/RScaLAPACK/configure.in.AC_MSG_ERROR RScaLAPACK/RScaLAPACK/configure.in
--- RScaLAPACK/RScaLAPACK/configure.in.AC_MSG_ERROR 2010-01-14 17:29:50.343197054 -0500
+++ RScaLAPACK/RScaLAPACK/configure.in 2010-01-14 17:30:26.823078573 -0500
@@ -175,7 +175,7 @@ if test "${supply_blas}" = yes || test "
LIBS="-lf77blas ${LIBS}"
else
- AC_MSG_ERROR(libf77blas.a not found,-1)
+ AC_MSG_ERROR(libf77blas.a not found)
fi
else
if test -f ${BLAS_LIB}/libblas.a; then
@@ -188,7 +188,7 @@ if test "${supply_blas}" = yes || test "
LIBS="-lrefblas ${LIBS}"
else
- AC_MSG_ERROR(libblas.a not found,-1)
+ AC_MSG_ERROR(libblas.a not found)
fi
fi
@@ -202,14 +202,14 @@ else
AC_LANG_PUSH(Fortran 77)
AC_CHECK_LIB(f77blas, ztrsm,[
LIBS="-lf77blas ${LIBS}"], [
- AC_MSG_ERROR(libf77blas.a not found,-1)
+ AC_MSG_ERROR(libf77blas.a not found)
])
AC_LANG_POP(Fortran 77)
else
AC_LANG_PUSH(Fortran 77)
AC_CHECK_LIB(blas, ztrsm,[
LIBS="-lblas ${LIBS}"], [
- AC_MSG_ERROR(libblas.a not found,-1)
+ AC_MSG_ERROR(libblas.a not found)
])
AC_LANG_POP(Fortran 77)
fi
@@ -233,7 +233,7 @@ if test "${supply_blacs}" = yes || test
LIBS="${SCALAPACK_LIB}/blacs.a ${LIBS}"
else
- AC_MSG_ERROR(libblacs.a not found,-1)
+ AC_MSG_ERROR(libblacs.a not found)
fi
if test -f ${BLACS_LIB}/libmpiblacsCinit.so; then
@@ -252,7 +252,7 @@ if test "${supply_blacs}" = yes || test
LIBS="${SCALAPACK_LIB}/blacsC.a ${LIBS}"
else
- AC_MSG_ERROR(libblacsCinit.a not found,-1)
+ AC_MSG_ERROR(libblacsCinit.a not found)
fi
if test -f ${BLACS_LIB}/libmpiblacsF77init.so; then
@@ -271,19 +271,19 @@ if test "${supply_blacs}" = yes || test
LIBS="${SCALAPACK_LIB}/blacsF77.a ${LIBS}"
else
- AC_MSG_ERROR(libcblacsF77init.a not found,-1)
+ AC_MSG_ERROR(libcblacsF77init.a not found)
fi
else
AC_CHECK_LIB(mpiblacs, Cblacs_gridexit,[], [
- AC_MSG_ERROR(libmpiblacs.a not found,-1)
+ AC_MSG_ERROR(libmpiblacs.a not found)
])
AC_CHECK_LIB(mpiblacsCinit, Cblacs_pinfo,[],[
- AC_MSG_ERROR(libmpiblacsCinit.a not found,-1)
+ AC_MSG_ERROR(libmpiblacsCinit.a not found)
])
AC_CHECK_LIB(mpiblacsF77init, blacs_pinfo_,[],[
- AC_MSG_ERROR(libmpiblacsF77init.a not found,-1)
+ AC_MSG_ERROR(libmpiblacsF77init.a not found)
])
fi
@@ -296,13 +296,13 @@ if test "${supply_scalapack}" = yes; the
elif test -f ${SCALAPACK_LIB}/libscalapack.a; then
LIBS="-lscalapack ${LIBS}"
else
- AC_MSG_ERROR(libscalapack.a not found,-1)
+ AC_MSG_ERROR(libscalapack.a not found)
fi
else
AC_LANG_PUSH(Fortran 77)
AC_CHECK_LIB(scalapack, pdgesv, [],[
- AC_MSG_ERROR(libscalapack.a not found,-1)
+ AC_MSG_ERROR(libscalapack.a not found)
])
AC_LANG_POP(Fortran 77)
fi
R-RScaLAPACK-0.6.1-atlas.patch:
configure.in | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
--- NEW FILE R-RScaLAPACK-0.6.1-atlas.patch ---
diff -up RScaLAPACK/RScaLAPACK/configure.in.atlas RScaLAPACK/RScaLAPACK/configure.in
--- RScaLAPACK/RScaLAPACK/configure.in.atlas 2010-01-14 16:49:48.093095946 -0500
+++ RScaLAPACK/RScaLAPACK/configure.in 2010-01-14 16:51:44.234094772 -0500
@@ -92,6 +92,14 @@ AC_ARG_WITH(scalapack,
AC_MSG_NOTICE(SCALAPACK_LIB=${SCALAPACK_LIB} .. is set)
])
+AC_ARG_WITH(atlas,
+[ --with-atlas=/usr/local/lib Location of ATLAS library],
+[ATLAS_LIB=${withval}
+ supply_atlas=yes
+ AC_MSG_NOTICE(ATLAS_LIB=${ATLAS_LIB} .. is set)
+])
+
+
dnl Checks for libraries
AC_LANG(C)
@@ -119,6 +127,10 @@ if test "${supply_scalapack}" = yes; the
LDFLAGS="-L${SCALAPACK_LIB} ${LDFLAGS}"
fi
+if test "${supply_atlas}" = yes; then
+ LDFLAGS="-L${ATLAS_LIB} ${LDFLAGS}"
+fi
+
AC_CHECK_LIB(pthread, pthread_atfork,[
PALIBS="-lpthread"
],[
@@ -142,8 +154,9 @@ fi
if test "${supply_blas}" = yes || test "${supply_scalapack}" = yes; then
-
- if test -f ${BLAS_LIB}/libatlas.a; then
+ if test -f ${ATLAS_LIB}/libatlas.so; then
+ LIBS="-latlas ${LIBS}"
+ elif test -f ${BLAS_LIB}/libatlas.a; then
LIBS="-latlas ${LIBS}"
elif test -f ${SCALAPACK_LIB}/libatlas.a; then
LIBS="-latlas ${LIBS}"
R-RScaLAPACK-0.6.1-blas.patch:
configure.in | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--- NEW FILE R-RScaLAPACK-0.6.1-blas.patch ---
diff -up RScaLAPACK/RScaLAPACK/configure.in.blas RScaLAPACK/RScaLAPACK/configure.in
--- RScaLAPACK/RScaLAPACK/configure.in.blas 2010-01-14 17:32:16.811069287 -0500
+++ RScaLAPACK/RScaLAPACK/configure.in 2010-01-14 17:32:47.626211286 -0500
@@ -53,7 +53,7 @@ supply_scalapack=no
MPI_LAM=no
MPI_MPICH=no
OMPI=no
-ATLAS_BLAS=yes
+ATLAS_BLAS=no
AC_ARG_WITH(mpi,
[ --with-mpi=/usr/local Location of MPI_HOME],
@@ -178,7 +178,10 @@ if test "${supply_blas}" = yes || test "
AC_MSG_ERROR(libf77blas.a not found)
fi
else
- if test -f ${BLAS_LIB}/libblas.a; then
+ if test -f ${BLAS_LIB}/libblas.so; then
+ LIBS="-lblas ${LIBS}"
+
+ elif test -f ${BLAS_LIB}/libblas.a; then
LIBS="-lblas ${LIBS}"
elif test -f ${SCALAPACK_LIB}/libblas.a; then
R-RScaLAPACK-0.6.1-configurefix.patch:
configure.in | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE R-RScaLAPACK-0.6.1-configurefix.patch ---
diff -up RScaLAPACK/RScaLAPACK/configure.in.configurefix RScaLAPACK/RScaLAPACK/configure.in
--- RScaLAPACK/RScaLAPACK/configure.in.configurefix 2009-10-26 11:03:40.000000000 -0400
+++ RScaLAPACK/RScaLAPACK/configure.in 2010-01-14 16:27:48.452073329 -0500
@@ -193,8 +193,8 @@ else
else
AC_LANG_PUSH(Fortran 77)
AC_CHECK_LIB(blas, ztrsm,[
- LIBS="-lf77blas ${LIBS}"], [
- AC_MSG_ERROR(libf77blas.a not found,-1)
+ LIBS="-lblas ${LIBS}"], [
+ AC_MSG_ERROR(libblas.a not found,-1)
])
AC_LANG_POP(Fortran 77)
fi
@@ -250,16 +250,16 @@ if test "${supply_blacs}" = yes || test
AC_MSG_ERROR(libcblacsF77init.a not found,-1)
fi
else
- AC_CHECK_LIB(blacs, Cblacs_gridexit,[], [
- AC_MSG_ERROR(libblacs.a not found,-1)
+ AC_CHECK_LIB(mpiblacs, Cblacs_gridexit,[], [
+ AC_MSG_ERROR(libmpiblacs.a not found,-1)
])
- AC_CHECK_LIB(blacsCinit, Cblacs_pinfo,[],[
- AC_MSG_ERROR(libblacsCinit.a not found,-1)
+ AC_CHECK_LIB(mpiblacsCinit, Cblacs_pinfo,[],[
+ AC_MSG_ERROR(libmpiblacsCinit.a not found,-1)
])
- AC_CHECK_LIB(blacsF77init, blacs_pinfo__,[],[
- AC_MSG_ERROR(libblacsF77init.a not found,-1)
+ AC_CHECK_LIB(mpiblacsF77init, blacs_pinfo_,[],[
+ AC_MSG_ERROR(libmpiblacsF77init.a not found,-1)
])
fi
R-RScaLAPACK-0.6.1-fflags.patch:
Makefile.in | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
--- NEW FILE R-RScaLAPACK-0.6.1-fflags.patch ---
diff -up RScaLAPACK/RScaLAPACK/src/Makefile.in.fflags RScaLAPACK/RScaLAPACK/src/Makefile.in
--- RScaLAPACK/RScaLAPACK/src/Makefile.in.fflags 2010-01-14 17:43:23.992069392 -0500
+++ RScaLAPACK/RScaLAPACK/src/Makefile.in 2010-01-14 17:44:10.974094917 -0500
@@ -29,31 +29,31 @@ CRDriver: CRDriver.o $(CR_OBJECTS)
cp CRDriver $(exec_dir)
callpdgesv.o:callpdgesv.f
- gfortran -g -O2 -c callpdgesv.f
+ gfortran $(FFLAGS) -c callpdgesv.f
callpdgeqrf.o:callpdgeqrf.f
- gfortran -g -O2 -c callpdgeqrf.f
+ gfortran $(FFLAGS) -c callpdgeqrf.f
callpdgesvd.o:callpdgesvd.f
- gfortran -g -O2 -c callpdgesvd.f
+ gfortran $(FFLAGS) -c callpdgesvd.f
callpdgemm.o:callpdgemm.f
- gfortran -g -O2 -c callpdgemm.f
+ gfortran $(FFLAGS) -c callpdgemm.f
callpdpotrf.o:callpdpotrf.f
- gfortran -g -O2 -c callpdpotrf.f
+ gfortran $(FFLAGS) -c callpdpotrf.f
callpdpotri.o:callpdpotri.f
- gfortran -g -O2 -c callpdpotri.f
+ gfortran $(FFLAGS) -c callpdpotri.f
callpdsyevd.o:callpdsyevd.f
- gfortran -g -O2 -c callpdsyevd.f
+ gfortran $(FFLAGS) -c callpdsyevd.f
CRcollectData.o:CRcollectData.f
- gfortran -g -O2 -c CRcollectData.f
+ gfortran $(FFLAGS) -c CRcollectData.f
CRdistData.o:CRdistData.f
- gfortran -g -O2 -c CRdistData.f
+ gfortran $(FFLAGS) -c CRdistData.f
clean:
R-RScaLAPACK-0.6.1-lapack.patch:
configure.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- NEW FILE R-RScaLAPACK-0.6.1-lapack.patch ---
diff -up RScaLAPACK/RScaLAPACK/configure.in.lapack RScaLAPACK/RScaLAPACK/configure.in
--- RScaLAPACK/RScaLAPACK/configure.in.lapack 2010-01-14 16:56:17.438069070 -0500
+++ RScaLAPACK/RScaLAPACK/configure.in 2010-01-14 16:56:54.700069361 -0500
@@ -139,8 +139,10 @@ AC_CHECK_LIB(pthread, pthread_atfork,[
if test "${supply_lapack}" = yes; then
-
- if test -f ${LAPACK_LIB}/liblapack.a; then
+ if test -f ${LAPACK_LIB}/liblapack.so; then
+ LIBS="-llapack ${LIBS}"
+ AC_MSG_NOTICE(lapack libs found)
+ elif test -f ${LAPACK_LIB}/liblapack.a; then
LIBS="-llapack ${LIBS}"
elif test -f ${SCALAPACK_LIB}/libreflapack.a; then
LIBS="${SCALAPACK_LIB}/libreflapack.a ${LIBS}"
R-RScaLAPACK-0.6.1-mpiblacs.patch:
configure.in | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
--- NEW FILE R-RScaLAPACK-0.6.1-mpiblacs.patch ---
diff -up RScaLAPACK/RScaLAPACK/configure.in.mpiblacs RScaLAPACK/RScaLAPACK/configure.in
--- RScaLAPACK/RScaLAPACK/configure.in.mpiblacs 2010-01-14 17:13:11.239094888 -0500
+++ RScaLAPACK/RScaLAPACK/configure.in 2010-01-14 17:17:35.264095227 -0500
@@ -217,7 +217,10 @@ fi
if test "${supply_blacs}" = yes || test "${supply_scalapack}" = yes; then
- if test -f ${BLACS_LIB}/libblacs.a; then
+ if test -f ${BLACS_LIB}/libmpiblacs.so; then
+ LIBS="-lmpiblacs ${LIBS}"
+
+ elif test -f ${BLACS_LIB}/libblacs.a; then
LIBS="-lblacs ${LIBS}"
elif test -f ${SCALAPACK_LIB}/libblacs.a; then
@@ -233,7 +236,10 @@ if test "${supply_blacs}" = yes || test
AC_MSG_ERROR(libblacs.a not found,-1)
fi
- if test -f ${BLACS_LIB}/libblacsCinit.a; then
+ if test -f ${BLACS_LIB}/libmpiblacsCinit.so; then
+ LIBS="-lmpiblacsCinit ${LIBS}"
+
+ elif test -f ${BLACS_LIB}/libblacsCinit.a; then
LIBS="-lblacsCinit ${LIBS}"
elif test -f ${SCALAPACK_LIB}/libblacsCinit.a; then
@@ -249,7 +255,10 @@ if test "${supply_blacs}" = yes || test
AC_MSG_ERROR(libblacsCinit.a not found,-1)
fi
- if test -f ${BLACS_LIB}/libblacsF77init.a; then
+ if test -f ${BLACS_LIB}/libmpiblacsF77init.so; then
+ LIBS="-lmpiblacsF77init ${LIBS}"
+
+ elif test -f ${BLACS_LIB}/libblacsF77init.a; then
LIBS="-lblacsF77init ${LIBS}"
elif test -f ${SCALAPACK_LIB}/libblacsF77init.a; then
@@ -282,7 +291,9 @@ fi
if test "${supply_scalapack}" = yes; then
- if test -f ${SCALAPACK_LIB}/libscalapack.a; then
+ if test -f ${SCALAPACK_LIB}/libscalapack.so; then
+ LIBS="-lscalapack ${LIBS}"
+ elif test -f ${SCALAPACK_LIB}/libscalapack.a; then
LIBS="-lscalapack ${LIBS}"
else
AC_MSG_ERROR(libscalapack.a not found,-1)
R-RScaLAPACK-0.6.1-mpicc.patch:
configure.in | 7 ++++---
src/Makefile.in | 4 +++-
2 files changed, 7 insertions(+), 4 deletions(-)
--- NEW FILE R-RScaLAPACK-0.6.1-mpicc.patch ---
diff -up RScaLAPACK/RScaLAPACK/configure.in.mpicc RScaLAPACK/RScaLAPACK/configure.in
--- RScaLAPACK/RScaLAPACK/configure.in.mpicc 2010-01-14 16:43:05.204067582 -0500
+++ RScaLAPACK/RScaLAPACK/configure.in 2010-01-14 16:45:44.199069128 -0500
@@ -39,8 +39,8 @@ if test -z "${R_HOME}"; then
exit 1
fi
-CC=`"${R_HOME}/bin/R" CMD config CC`
-F77=`"${R_HOME}/bin/R" CMD config F77`
+CC="@MPICC@"
+F77="@MPIF77@"
RCFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
CFLAGS="${RCFLAGS} ${CFLAGS}"
@@ -395,7 +395,8 @@ LIBS="${PKG_LIBS} ${LIBS}"
PALIBS="${PKG_LIBS} ${LIBS}"
-CC=`${R_HOME}/bin/R CMD config CC`;
+# CC=`${R_HOME}/bin/R CMD config CC`;
+CC=`@MPICC@`;
CXX=`${R_HOME}/bin/R CMD config CXX`;
RINC=`${R_HOME}/bin/R CMD config --cppflags`
diff -up RScaLAPACK/RScaLAPACK/src/Makefile.in.mpicc RScaLAPACK/RScaLAPACK/src/Makefile.in
--- RScaLAPACK/RScaLAPACK/src/Makefile.in.mpicc 2009-10-26 11:03:40.000000000 -0400
+++ RScaLAPACK/RScaLAPACK/src/Makefile.in 2010-01-14 16:46:34.116073747 -0500
@@ -9,6 +9,8 @@ PALIBS=@PALIBS@
INTRINSICLIBS=-lgfortran -ldl
exec_dir=../exec
+CC=@MPICC@
+SHLIB_LD=mpicc -m64 -std=gnu99
PA_OBJECTS=ParallelAgent.o PAdistData.o
CR_OBJECTS=CRscalapack.o callpdgesv.o callpdgeqrf.o callpdgesvd.o callpdgemm.o\
@@ -23,7 +25,7 @@ RScaLAPACK.so: $(PA_OBJECTS)
CRDriver: CRDriver.o $(CR_OBJECTS)
- gcc -std=gnu99 CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(LIBS) $(CFLAGS) $(INTRINSICLIBS) -o $@
+ $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(LIBS) $(CFLAGS) $(INTRINSICLIBS) -o $@
cp CRDriver $(exec_dir)
callpdgesv.o:callpdgesv.f
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/R-RScaLAPACK/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 9 Mar 2006 16:52:36 -0000 1.3
+++ .cvsignore 14 Jan 2010 22:49:09 -0000 1.4
@@ -1,2 +1 @@
-RScaLAPACK_0.4.0.tar.gz
-RScaLAPACK_0.5.1.tar.gz
+RScaLAPACK_0.6.1.tar.gz
Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- R-RScaLAPACK.spec 20 Aug 2009 02:17:27 -0000 1.34
+++ R-RScaLAPACK.spec 14 Jan 2010 22:49:10 -0000 1.35
@@ -28,26 +28,28 @@
module unload scalapack-openmpi-%{_arch};
Name: R-%{packname}
-Version: 0.5.1
-Release: 22%{?dist}
+Version: 0.6.1
+Release: 1%{?dist}
Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
License: MIT
URL: http://cran.r-project.org/web/packages/RScaLAPACK/index.html
Group: Applications/Engineering
Summary: An interface to perform parallel computation on linear algebra problems using ScaLAPACK
-BuildRequires: openmpi-devel, R-devel, tetex-latex, lapack-devel, blas-devel
+BuildRequires: openmpi-devel, R-devel, tetex-latex, lapack-devel, blas-devel, atlas-devel
BuildRequires: gcc-gfortran, blacs-openmpi-devel, scalapack-openmpi-devel, autoconf, automake
Requires: R-core, scalapack-openmpi, openmpi
Requires(post): R-core
Requires(postun): R-core
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: R-RScaLAPACK-0.5.1-mpi-blacs.patch
-Patch1: R-RScaLAPACK-0.5.1-gcc4.patch
-Patch3: R-RScaLAPACK-0.5.1-configurefix.patch
-Patch4: R-RScaLAPACK-0.5.1-blacsfix.patch
-Patch5: R-RScaLAPACK-0.5.1-mpi_comm_create_.patch
-Patch6: R-RScaLAPACK-0.5.1-mpicc.patch
-Patch7: R-RScaLAPACK-0.5.1-openmpi.patch
+Patch3: R-RScaLAPACK-0.6.1-configurefix.patch
+Patch6: R-RScaLAPACK-0.6.1-mpicc.patch
+Patch7: R-RScaLAPACK-0.6.1-atlas.patch
+Patch8: R-RScaLAPACK-0.6.1-lapack.patch
+Patch9: R-RScaLAPACK-0.6.1-mpiblacs.patch
+Patch10: R-RScaLAPACK-0.6.1-AC_MSG_ERROR.patch
+Patch11: R-RScaLAPACK-0.6.1-blas.patch
+Patch12: R-RScaLAPACK-0.6.1-fflags.patch
%description
R package:
@@ -57,13 +59,15 @@ ScaLAPACK library for the linear algebra
%prep
%setup -q -c -n %{packname}
-%patch0 -p1
-%patch1 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch0 -p1 -b .mpi
+%patch3 -p1 -b .configurefix
+%patch6 -p1 -b .mpicc
+%patch7 -p1 -b .atlas
+%patch8 -p1 -b .lapack
+%patch9 -p1 -b .mpiblacs
+%patch10 -p1 -b .AC_MSG_ERROR
+%patch11 -p1 -b .blas
+%patch12 -p1 -b .fflags
cd RScaLAPACK
R_CC=`R CMD config CC`
@@ -89,13 +93,20 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/lib
export MPI_COMPILER=openmpi
%{_openmpi_load}
OPENMPICFLAGS="$CFLAGS"
-OPENMPILDFLAGS="$LDFLAGS"
+OPENMPILDFLAGS="-L$MPI_LIB"
+OPENMPI_INCLUDE="-I$MPI_INCLUDE"
%{_blacs_openmpi_load}
BLACSCFLAGS="$CFLAGS"
BLACSLDFLAGS="$LDFLAGS"
%{_scalapack_openmpi_load}
-RPM_OPT_FLAGS="$CFLAGS %{optflags}"
-%{_bindir}/R CMD INSTALL --configure-args="--with-blas=%{_libdir} CC='mpicc' F77='mpif77' CFLAGS='$RPM_OPT_FLAGS $LDFLAGS $BLACSLDFLAGS $OPENMPILDFLAGS -lutil -lmpiblacsCinit -lmpiblacs -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS $LDFLAGS $BLACSLDFLAGS $OPENMPILDFLAGS -lutil -llapack -lmpi'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname}
+export RPM_OPT_FLAGS="%{optflags}"
+export CFLAGS="$RPM_OPT_FLAGS $LDFLAGS $BLACSLDFLAGS $OPENMPILDFLAGS -lutil -lmpiblacsCinit -lmpiblacs -lmpi -llapack"
+export CC=mpicc
+export F77=mpif77
+export FFLAGS="$RPM_OPT_FLAGS $LDFLAGS $BLACSLDFLAGS $OPENMPILDFLAGS -lutil -llapack -lmpi"
+export MPI_INCLUDE="$OPENMPI_INCLUDE"
+%{_bindir}/R CMD INSTALL --library=$RPM_BUILD_ROOT%{_libdir}/R/library \
+ --configure-args="--with-blacs=%{_libdir}/blacs-openmpi/ --with-lapack=%{_libdir} --with-blas=%{_libdir} --with-atlas=%{_libdir}/atlas/ --with-scalapack=%{_libdir}/scalapack-openmpi/ CC=mpicc FFLAGS='$RPM_OPT_FLAGS $LDFLAGS $BLACSLDFLAGS $OPENMPILDFLAGS -lutil -llapack -lmpi'" %{packname}
%{_scalapack_openmpi_unload}
%{_blacs_openmpi_unload}
%{_openmpi_unload}
@@ -122,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/R/library/%{packname}/
%changelog
+* Thu Jan 14 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.1-1
+- glue this package back together, update to 0.6.1
+
* Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.5.1-22
- fix url, drop old bitsize macros
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/R-RScaLAPACK/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 9 Mar 2006 16:52:36 -0000 1.3
+++ sources 14 Jan 2010 22:49:10 -0000 1.4
@@ -1 +1 @@
-906d69b630dbd4a50960b2ce099d460f RScaLAPACK_0.5.1.tar.gz
+ce467963a9230a880fdd13f1ea5ac1b5 RScaLAPACK_0.6.1.tar.gz
More information about the scm-commits
mailing list