rpms/R-RScaLAPACK/devel R-RScaLAPACK-0.4.0-lam-mpi-blacs64.patch, NONE, 1.1 R-RScaLAPACK.spec, 1.5, 1.6

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	R-RScaLAPACK.spec 
Added Files:
	R-RScaLAPACK-0.4.0-lam-mpi-blacs64.patch 
Log Message:

64 bit library fix


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

--- NEW FILE R-RScaLAPACK-0.4.0-lam-mpi-blacs64.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/lib64/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/lib64/libmpiblacs.a -llam /usr/lib64/libmpi.a /usr/lib64/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/lib64/libmpiblacs.a -llam /usr/lib64/libmpi.a /usr/lib64/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/lib64/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/lib64/libmpiblacsF77init.a /usr/lib64/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/lib64/libmpiblacsF77init.a /usr/lib64/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


Index: R-RScaLAPACK.spec
===================================================================
RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- R-RScaLAPACK.spec	9 May 2005 19:57:54 -0000	1.5
+++ R-RScaLAPACK.spec	15 May 2005 22:12:46 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name: R-%{packname}
 Version: 0.4.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz
 License: Freely distributable
 URL: http://cran.r-project.org/contrib
@@ -14,6 +14,7 @@
 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
+Patch2: R-RScaLAPACK-0.4.0-lam-mpi-blacs64.patch
 
 %description
 R package:
@@ -23,7 +24,11 @@
 
 %prep
 %setup -T -c -a 0
+%ifarch x86_64 ppc64 sparc64 alpha
+%patch2 -p1
+%else
 %patch0 -p1
+%endif
 %patch1 -p1
 
 %build
@@ -54,6 +59,9 @@
 %{_libdir}/R/library/%{packname}
 
 %changelog
+* Sun May 15 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.4.0-7
+- 64 bit lib fix
+
 * Mon May  9 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.4.0-6
 - remove hardcoded dist tags