rpms/lam/F-8 lam-7.1.2-archmode.patch, NONE, 1.1 lam-gcc43-build.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 lam-7.1.2-no_darwin.patch, 1.1, 1.2 lam.module.in, 1.3, 1.4 lam.pc.in, 1.2, 1.3 lam.spec, 1.45, 1.46 sources, 1.14, 1.15 lam-7.1.2-archinc.patch, 1.1, NONE
Doug Ledford (dledford)
fedora-extras-commits at redhat.com
Wed Jun 25 18:27:57 UTC 2008
Author: dledford
Update of /cvs/extras/rpms/lam/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3646
Modified Files:
.cvsignore lam-7.1.2-no_darwin.patch lam.module.in lam.pc.in
lam.spec sources
Added Files:
lam-7.1.2-archmode.patch lam-gcc43-build.patch
Removed Files:
lam-7.1.2-archinc.patch
Log Message:
* Tue Jun 24 2008 Doug Ledford <dledford at redhat.com> - 2:7.1.4-1
- Update to latest upstream version
- Make sure to remove APSL licensed files from upstream tarball and rename
tarball to version-rh1 to indicate such
- Make lam exist in its own prefix, which forestalls all conflicts with other
mpi implementations and also eliminates the need for an alternatives setup
- Make environment-modules required for lam-libs and the default means of
selecting between lam/openmpi/other mpi implementations
- Only apply the archmode patch on arches where gcc will accept a mode flag
- Make sure we remove any stale lam alternatives configs when we install so
that upgrades will work properly
lam-7.1.2-archmode.patch:
--- NEW FILE lam-7.1.2-archmode.patch ---
--- lam-7.1.2-rh1/tools/wrappers/wrap_f77.cc.archmode 2006-02-23 18:27:02.000000000 -0500
+++ lam-7.1.2-rh1/tools/wrappers/wrap_f77.cc 2008-06-24 16:01:16.000000000 -0400
@@ -215,6 +215,7 @@ lam_wrap_build_cflags(bool want_cxx_incl
const string& prefix, lam_sv_t& cflags)
{
string incdir(LAM_INCDIR);
+ string mode(LAM_MODE);
cflags.clear();
@@ -225,6 +226,7 @@ lam_wrap_build_cflags(bool want_cxx_incl
if (want_f77_includes || incdir != "/usr/include")
cflags.push_back("-I" + incdir);
+ cflags.push_back("-m" + mode);
}
--- lam-7.1.2-rh1/tools/wrappers/wrap_cc.cc.archmode 2006-02-23 18:27:02.000000000 -0500
+++ lam-7.1.2-rh1/tools/wrappers/wrap_cc.cc 2008-06-24 16:00:49.000000000 -0400
@@ -215,6 +215,7 @@ lam_wrap_build_cflags(bool want_cxx_incl
const string& prefix, lam_sv_t& cflags)
{
string incdir(LAM_INCDIR);
+ string mode(LAM_MODE);
cflags.clear();
@@ -225,6 +226,7 @@ lam_wrap_build_cflags(bool want_cxx_incl
if (want_f77_includes || incdir != "/usr/include")
cflags.push_back("-I" + incdir);
+ cflags.push_back("-m" + mode);
}
--- lam-7.1.2-rh1/tools/wrappers/wrap_cxx.cc.archmode 2006-02-23 18:27:02.000000000 -0500
+++ lam-7.1.2-rh1/tools/wrappers/wrap_cxx.cc 2008-06-24 16:01:01.000000000 -0400
@@ -215,6 +215,7 @@ lam_wrap_build_cflags(bool want_cxx_incl
const string& prefix, lam_sv_t& cflags)
{
string incdir(LAM_INCDIR);
+ string mode(LAM_MODE);
cflags.clear();
@@ -225,6 +226,7 @@ lam_wrap_build_cflags(bool want_cxx_incl
if (want_f77_includes || incdir != "/usr/include")
cflags.push_back("-I" + incdir);
+ cflags.push_back("-m" + mode);
}
--- lam-7.1.2-rh1/tools/wrappers/wrap.cc.archmode 2006-02-23 18:27:02.000000000 -0500
+++ lam-7.1.2-rh1/tools/wrappers/wrap.cc 2008-06-24 16:00:30.000000000 -0400
@@ -215,6 +215,7 @@ lam_wrap_build_cflags(bool want_cxx_incl
const string& prefix, lam_sv_t& cflags)
{
string incdir(LAM_INCDIR);
+ string mode(LAM_MODE);
cflags.clear();
@@ -225,6 +226,7 @@ lam_wrap_build_cflags(bool want_cxx_incl
if (want_f77_includes || incdir != "/usr/include")
cflags.push_back("-I" + incdir);
+ cflags.push_back("-m" + mode);
}
lam-gcc43-build.patch:
--- NEW FILE lam-gcc43-build.patch ---
--- lam-7.1.4-rh1/config/lam_check_prefix_memcpy.m4.gcc43 2006-06-24 16:42:44.000000000 -0400
+++ lam-7.1.4-rh1/config/lam_check_prefix_memcpy.m4 2008-06-24 20:16:47.000000000 -0400
@@ -28,7 +28,7 @@ AC_MSG_CHECKING([for glibc])
AC_TRY_RUN([
#include <stdio.h>
-int main(int argc, char* argv[])
+int main(int argc, char** argv)
{
FILE *fp = fopen("configtest.out", "w");
#ifdef __GLIBC__
--- lam-7.1.4-rh1/config/lam_check_bsd43_fd_passing.m4.gcc43 2006-06-24 16:42:44.000000000 -0400
+++ lam-7.1.4-rh1/config/lam_check_bsd43_fd_passing.m4 2008-06-24 20:16:47.000000000 -0400
@@ -76,7 +76,7 @@ LAM_TRY_RUN_FD_PASSING([#include <sys/ty
pid_t child_pid = 0;
int
-main(int argc, char *argv[])
+main(int argc, char **argv)
{
int fd[2];
int status = 0;
--- lam-7.1.4-rh1/config/lam_get_shmmax.m4.gcc43 2006-06-24 16:42:44.000000000 -0400
+++ lam-7.1.4-rh1/config/lam_get_shmmax.m4 2008-06-24 20:16:47.000000000 -0400
@@ -44,7 +44,7 @@ test_alloc(int size)
return(1);
}
int
-main(int argc, char* argv[])
+main(int argc, char** argv)
{
int poolsize, maxalloc;
FILE *f=fopen("conftestval", "w");
--- lam-7.1.4-rh1/config/cxx_find_template_repository.m4.gcc43 2006-06-24 16:42:44.000000000 -0400
+++ lam-7.1.4-rh1/config/cxx_find_template_repository.m4 2008-06-24 20:16:47.000000000 -0400
@@ -82,7 +82,7 @@ foo<T>::member(int i)
}
int
-main(int argc, char *argv[])
+main(int argc, char **argv)
{
foo<bar> var1(6);
foo< foo<bar> > var2(var1);
--- lam-7.1.4-rh1/config/lam_check_pthread_pids.m4.gcc43 2006-06-24 16:42:44.000000000 -0400
+++ lam-7.1.4-rh1/config/lam_check_pthread_pids.m4 2008-06-24 20:16:47.000000000 -0400
@@ -44,7 +44,7 @@ AC_TRY_RUN([#include <pthread.h>
#include <unistd.h>
#include <stdlib.h>
void *checkpid(void *arg);
-int main(int argc, char* argv[]) {
+int main(int argc, char** argv) {
pthread_t thr;
int pid, retval;
pid = getpid();
--- lam-7.1.4-rh1/config/lam_check_stdc.m4.gcc43 2006-06-24 16:42:44.000000000 -0400
+++ lam-7.1.4-rh1/config/lam_check_stdc.m4 2008-06-24 20:16:47.000000000 -0400
@@ -23,7 +23,7 @@ cat > conftest.c <<EOF
extern "C" {
void exit(int);
#endif
-int main(int argc, char* argv[])
+int main(int argc, char** argv)
{
FILE *f=fopen("conftestval", "w");
#ifndef __STDC__
--- lam-7.1.4-rh1/config/lam_get_alignment.m4.gcc43 2006-06-24 16:42:44.000000000 -0400
+++ lam-7.1.4-rh1/config/lam_get_alignment.m4 2008-06-24 20:16:47.000000000 -0400
@@ -24,7 +24,7 @@ AC_TRY_RUN([
#include <stdlib.h>
struct foo { char c; $1 x; };
-int main(int argc, char* argv[])
+int main(int argc, char** argv)
{
struct foo *p = (struct foo *) malloc(sizeof(struct foo));
int diff;
--- lam-7.1.4-rh1/config/cxx_have_nothrow_new.m4.gcc43 2006-06-24 16:42:44.000000000 -0400
+++ lam-7.1.4-rh1/config/cxx_have_nothrow_new.m4 2008-06-24 20:16:47.000000000 -0400
@@ -37,7 +37,7 @@ rm -f conftest.cc conftest.o
cat > conftest.cc <<EOF
#include <new>
-int main(int argc, char* argv[]) {
+int main(int argc, char** argv) {
int *baz;
unsigned int foo = 3;
baz = new(std::nothrow) int;
--- lam-7.1.4-rh1/config/lam_mutex_pshared.m4.gcc43 2006-06-24 16:42:44.000000000 -0400
+++ lam-7.1.4-rh1/config/lam_mutex_pshared.m4 2008-06-24 20:16:47.000000000 -0400
@@ -17,7 +17,7 @@ dnl
define(LAM_MUTEX_PSHARED,[
AC_MSG_CHECKING(for process shared pthread mutex)
AC_TRY_RUN([#include <pthread.h>
-int main(int argc, char* argv[]) {
+int main(int argc, char** argv) {
pthread_mutex_t m; pthread_mutexattr_t mattr;
if (pthread_mutexattr_init(&mattr)) return(1);
if (pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED)) return(1);
--- lam-7.1.4-rh1/config/lam_check_fd_setsize.m4.gcc43 2006-06-24 16:42:44.000000000 -0400
+++ lam-7.1.4-rh1/config/lam_check_fd_setsize.m4 2008-06-24 20:16:47.000000000 -0400
@@ -86,7 +86,7 @@ if test ! "$LAM_FD_SETSIZE" = "0" ; then
#include <sys/resource.h>
#include <unistd.h>
int
-main(int argc, char* argv[])
+main(int argc, char** argv)
{
int fd = 0;
struct rlimit rlp;
@@ -135,7 +135,7 @@ if test ! "$LAM_FD_SETSIZE" = "0"; then
#include <sys/select.h>
#endif
int
-main(int argc, char* argv[])
+main(int argc, char** argv)
{
int ret;
fd_set fds;
--- lam-7.1.4-rh1/config/lam_wrapper_extra_ldflags.m4.gcc43 2006-06-24 16:42:44.000000000 -0400
+++ lam-7.1.4-rh1/config/lam_wrapper_extra_ldflags.m4 2008-06-24 20:16:47.000000000 -0400
@@ -75,7 +75,7 @@ int foo(void) { return 1; }
EOF
cat > conftest.c <<EOF
extern int foo(void);
-int main(int argc, char* argv[]) { return foo(); }
+int main(int argc, char** argv) { return foo(); }
EOF
../libtool --mode=compile $CC foo.c -o foo.lo -c > /dev/null 2>&1
--- lam-7.1.4-rh1/config/cxx_have_bool.m4.gcc43 2006-06-24 16:42:44.000000000 -0400
+++ lam-7.1.4-rh1/config/cxx_have_bool.m4 2008-06-24 20:16:47.000000000 -0400
@@ -42,7 +42,7 @@ cat > conftest.cc <<EOF
#include <stdio.h>
#include <sys/types.h>
-int main(int argc, char* argv[]) {
+int main(int argc, char** argv) {
bool foo = (bool) 0;
printf("so foo is used and the compiler wont complain: %d", (int) foo);
return 0;
--- lam-7.1.4-rh1/config/cxx_have_true_false.m4.gcc43 2006-06-24 16:42:44.000000000 -0400
+++ lam-7.1.4-rh1/config/cxx_have_true_false.m4 2008-06-24 20:16:47.000000000 -0400
@@ -41,7 +41,7 @@ cat > conftest.cc <<EOF
#include <stdio.h>
#include <sys/types.h>
-int main(int argc, char* argv[]) {
+int main(int argc, char** argv) {
int foo;
foo = (int) true;
foo = (int) false;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lam/F-8/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 4 Oct 2006 06:32:16 -0000 1.13
+++ .cvsignore 25 Jun 2008 18:27:07 -0000 1.14
@@ -2,3 +2,4 @@
lam-7.1.1.tar.bz2
lam-7.1.2.tar.bz2
lam-7.1.2-rh1.tar.bz2
+lam-7.1.4-rh1.tar.bz2
lam-7.1.2-no_darwin.patch:
Index: lam-7.1.2-no_darwin.patch
===================================================================
RCS file: /cvs/extras/rpms/lam/F-8/lam-7.1.2-no_darwin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lam-7.1.2-no_darwin.patch 4 Oct 2006 06:32:17 -0000 1.1
+++ lam-7.1.2-no_darwin.patch 25 Jun 2008 18:27:08 -0000 1.2
@@ -1,30 +1,5 @@
---- lam-7.1.2-rh1/share/memory/Makefile.in.no_darwin 2006-10-03 14:54:07.000000000 -0400
-+++ lam-7.1.2-rh1/share/memory/Makefile.in 2006-10-03 14:55:11.000000000 -0400
-@@ -134,8 +134,6 @@ CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
- @LAM_WANT_DARWIN7MALLOC_FALSE@@LAM_WANT_PTMALLOC2_FALSE@@LAM_WANT_PTMALLOC_TRUE at libmemory_la_DEPENDENCIES = ptmalloc/libptmalloc.la
- @LAM_WANT_DARWIN7MALLOC_FALSE@@LAM_WANT_PTMALLOC2_TRUE at libmemory_la_DEPENDENCIES = ptmalloc2/libptmalloc2.la
-- at LAM_WANT_DARWIN7MALLOC_TRUE@libmemory_la_DEPENDENCIES = \
-- at LAM_WANT_DARWIN7MALLOC_TRUE@ darwin7/libdarwin7malloc.la
- am_libmemory_la_OBJECTS = memory_hook.lo
- libmemory_la_OBJECTS = $(am_libmemory_la_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/share/include
-@@ -363,12 +361,9 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign dist-bzip2
--SUBDIRS = ptmalloc ptmalloc2 darwin7
-+SUBDIRS = ptmalloc ptmalloc2
- noinst_LTLIBRARIES = libmemory.la
- libmemory_la_SOURCES = memory_hook.c
-- at LAM_WANT_DARWIN7MALLOC_TRUE@libmemory_la_LIBADD = \
-- at LAM_WANT_DARWIN7MALLOC_TRUE@ darwin7/libdarwin7malloc.la
--
- @LAM_WANT_PTMALLOC2_TRUE at libmemory_la_LIBADD = \
- @LAM_WANT_PTMALLOC2_TRUE@ ptmalloc2/libptmalloc2.la
-
---- lam-7.1.2-rh1/share/memory/Makefile.am.no_darwin 2006-10-03 14:53:41.000000000 -0400
-+++ lam-7.1.2-rh1/share/memory/Makefile.am 2006-10-03 14:53:57.000000000 -0400
+--- lam-7.1.4-rh1/share/memory/Makefile.am.no_darwin 2008-06-24 20:48:48.000000000 -0400
++++ lam-7.1.4-rh1/share/memory/Makefile.am 2008-06-24 20:49:08.000000000 -0400
@@ -14,7 +14,7 @@
include $(top_srcdir)/config/Makefile.options
@@ -42,45 +17,52 @@
-libmemory_la_LIBADD = \
- darwin7/libdarwin7malloc.la
-endif
---- lam-7.1.2-rh1/configure.no_darwin 2006-10-03 14:44:57.000000000 -0400
-+++ lam-7.1.2-rh1/configure 2006-10-03 14:52:47.000000000 -0400
-@@ -1100,7 +1100,7 @@ Optional Packages:
- --with-memory-manager=TYPE
- Use TYPE for intercepting memory management calls to
- control memory pinning (TYPE is one of
-- darwin,ptmalloc,ptmalloc2,external,none)
-+ ptmalloc,ptmalloc2,external,none)
- --with-tv-debug-flags=flags
- specify flags to pass to the compiler/linker to
- allow proper debugging symbols to be compiled (only
-@@ -43091,7 +43091,7 @@ lam_show_subtitle "Final output"
-
- ac_config_headers="$ac_config_headers share/include/lam_config.h"
-
-- !
ac_config_files="$ac_config_files Makefile config/Makefile config/lam-shell-setup.sh config/lam-shell-setup.csh config/lam_module.tcl doc/Makefile doc/install/Makefile doc/user/Makefile doc/user/version.tex etc/Makefile examples/Makefile examples/alltoall/Makefile examples/cxx/Makefile examples/fault/Makefile examples/hello/Makefile examples/mandelbrot/Makefile examples/mandelbrot/myapp examples/pi/Makefile examples/ring/Makefile examples/romio/Makefile examples/topology/Makefile examples/trivial/Makefile examples/trivial/myapp examples/wave1d/Makefile examples/wave1d/myapp man/Makefile man/man1/Makefile man/man2/Makefile man/man3/Makefile man/man5/Makefile!
man/man7/Makefile man/mans/Makefile otb/Makefile otb/bfctl/Ma!
kefile o
tb/bfstate/Makefile otb/doom/Makefile otb/fctl/Makefile otb/filedr/Makefile otb/fstate/Makefile otb/ipcdr/Makefile otb/kdump/Makefile otb/lamclean/Makefile otb/lamexec/Makefile otb/lamhalt/Makefile otb/lamgrow/Makefile otb/lamnodes/Makefile otb/lamshrink/Makefile otb/lamtrace/Makefile otb/lamcheckpoint/Makefile otb/lamrestart/Makefile otb/loadgo/Makefile otb/mpimsg/Makefile otb/mpirun/Makefile otb/mpitask/Makefile otb/state/Makefile otb/sys/Makefile otb/sys/bforward/Makefile otb/sys/bufferd/Makefile otb/sys/dli_inet/Makefile otb/sys/dlo_inet/Makefile otb/sys/echod/Makefile otb/sys/filed/Makefile otb/sys/flatd/Makefile otb/sys/iod/Makefile otb/sys/haltd/Makefile otb/sys/kenyad/Makefile otb/sys/kernel/Makefile otb/sys/loadd/Makefile otb/sys/router/Makefile otb/sys/traced/Makefile otb/sys/versiond/Makefile otb/sys/lamd/Makefile otb/sys/impid/Makefile otb/tping/Makefile share/Makefile share/args/Makefile share/boot/Makefile share/etc/Makefile share/freq/Makefile share/impi/Makef!
ile share/kreq/Makefile share/include/Makefile share/include/lam_build_info.h share/include/mpif.h share/include/patchlevel.h share/include/mpi2cxx/Makefile share/mpi/Makefile share/mpi/cxx/Makefile share/mpi/f77/Makefile share/mpi/totalview/Makefile share/nreq/Makefile share/pmpi/Makefile share/pmpi/f77/Makefile share/memory/Makefile share/memory/darwin7/Makefile share/memory/ptmalloc/Makefile share/memory/ptmalloc2/Makefile share/rreq/Makefile share/ssi/Makefile share/ssi/base/Makefile share/ssi/boot/Makefile share/ssi/boot/base/Makefile share/ssi/coll/Makefile share/ssi/coll/base/Makefile share/ssi/crlam/Makefile share/ssi/crlam/base/Makefile share/ssi/crmpi/Makefile share/ssi/crmpi/base/Makefile share/ssi/rpi/Makefile share/ssi/rpi/base/Makefile share/libmpi/Makefile share/liblam/Makefile share/dynamic-ssi/Makefile share/dynamic-ssi/boot/Makefile share/dynamic-ssi/coll/Makefile share/dynamic-ssi/crlam/Makefile share/dynamic-ssi/crmpi/Makefile share/dynamic-ssi/rpi/Makef!
ile share/threads/Makefile share/trillium/Makefile share/tstdi!
o/Makefi
le tools/Makefile tools/hboot/Makefile tools/lamboot/Makefile tools/laminfo/Makefile tools/mpiexec/Makefile tools/recon/Makefile tools/tkill/Makefile tools/wipe/Makefile tools/wrappers/Makefile romio/util/lam-configure-values"
-+ !
ac_config_files="$ac_config_files Makefile config/Makefile config/lam-shell-setup.sh config/lam-shell-setup.csh config/lam_module.tcl doc/Makefile doc/install/Makefile doc/user/Makefile doc/user/version.tex etc/Makefile examples/Makefile examples/alltoall/Makefile examples/cxx/Makefile examples/fault/Makefile examples/hello/Makefile examples/mandelbrot/Makefile examples/mandelbrot/myapp examples/pi/Makefile examples/ring/Makefile examples/romio/Makefile examples/topology/Makefile examples/trivial/Makefile examples/trivial/myapp examples/wave1d/Makefile examples/wave1d/myapp man/Makefile man/man1/Makefile man/man2/Makefile man/man3/Makefile man/man5/Makefile!
man/man7/Makefile man/mans/Makefile otb/Makefile otb/bfctl/Ma!
kefile o
tb/bfstate/Makefile otb/doom/Makefile otb/fctl/Makefile otb/filedr/Makefile otb/fstate/Makefile otb/ipcdr/Makefile otb/kdump/Makefile otb/lamclean/Makefile otb/lamexec/Makefile otb/lamhalt/Makefile otb/lamgrow/Makefile otb/lamnodes/Makefile otb/lamshrink/Makefile otb/lamtrace/Makefile otb/lamcheckpoint/Makefile otb/lamrestart/Makefile otb/loadgo/Makefile otb/mpimsg/Makefile otb/mpirun/Makefile otb/mpitask/Makefile otb/state/Makefile otb/sys/Makefile otb/sys/bforward/Makefile otb/sys/bufferd/Makefile otb/sys/dli_inet/Makefile otb/sys/dlo_inet/Makefile otb/sys/echod/Makefile otb/sys/filed/Makefile otb/sys/flatd/Makefile otb/sys/iod/Makefile otb/sys/haltd/Makefile otb/sys/kenyad/Makefile otb/sys/kernel/Makefile otb/sys/loadd/Makefile otb/sys/router/Makefile otb/sys/traced/Makefile otb/sys/versiond/Makefile otb/sys/lamd/Makefile otb/sys/impid/Makefile otb/tping/Makefile share/Makefile share/args/Makefile share/boot/Makefile share/etc/Makefile share/freq/Makefile share/impi/Makef!
ile share/kreq/Makefile share/include/Makefile share/include/lam_build_info.h share/include/mpif.h share/include/patchlevel.h share/include/mpi2cxx/Makefile share/mpi/Makefile share/mpi/cxx/Makefile share/mpi/f77/Makefile share/mpi/totalview/Makefile share/nreq/Makefile share/pmpi/Makefile share/pmpi/f77/Makefile share/memory/Makefile share/memory/ptmalloc/Makefile share/memory/ptmalloc2/Makefile share/rreq/Makefile share/ssi/Makefile share/ssi/base/Makefile share/ssi/boot/Makefile share/ssi/boot/base/Makefile share/ssi/coll/Makefile share/ssi/coll/base/Makefile share/ssi/crlam/Makefile share/ssi/crlam/base/Makefile share/ssi/crmpi/Makefile share/ssi/crmpi/base/Makefile share/ssi/rpi/Makefile share/ssi/rpi/base/Makefile share/libmpi/Makefile share/liblam/Makefile share/dynamic-ssi/Makefile share/dynamic-ssi/boot/Makefile share/dynamic-ssi/coll/Makefile share/dynamic-ssi/crlam/Makefile share/dynamic-ssi/crmpi/Makefile share/dynamic-ssi/rpi/Makefile share/threads/Makefile sha!
re/trillium/Makefile share/tstdio/Makefile tools/Makefile tool!
s/hboot/
Makefile tools/lamboot/Makefile tools/laminfo/Makefile tools/mpiexec/Makefile tools/recon/Makefile tools/tkill/Makefile tools/wipe/Makefile tools/wrappers/Makefile romio/util/lam-configure-values"
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -43855,7 +43855,6 @@ do
- "share/pmpi/Makefile" ) CONFIG_FILES="$CONFIG_FILES share/pmpi/Makefile" ;;
- "share/pmpi/f77/Makefile" ) CONFIG_FILES="$CONFIG_FILES share/pmpi/f77/Makefile" ;;
- "share/memory/Makefile" ) CONFIG_FILES="$CONFIG_FILES share/memory/Makefile" ;;
-- "share/memory/darwin7/Makefile" ) CONFIG_FILES="$CONFIG_FILES share/memory/darwin7/Makefile" ;;
- "share/memory/ptmalloc/Makefile" ) CONFIG_FILES="$CONFIG_FILES share/memory/ptmalloc/Makefile" ;;
- "share/memory/ptmalloc2/Makefile" ) CONFIG_FILES="$CONFIG_FILES share/memory/ptmalloc2/Makefile" ;;
- "share/rreq/Makefile" ) CONFIG_FILES="$CONFIG_FILES share/rreq/Makefile" ;;
-@@ -45047,13 +45046,6 @@ fi ;;
+--- lam-7.1.4-rh1/configure.in.no_darwin 2008-06-24 20:47:56.000000000 -0400
++++ lam-7.1.4-rh1/configure.in 2008-06-24 20:48:24.000000000 -0400
+@@ -199,20 +199,6 @@ lam_enable_static="$enable_static"
+ AM_DISABLE_SHARED
+ AM_ENABLE_STATIC
+
+-if test "$enable_static" = "no" -a "$enable_shared" = "yes"; then
+- case "$host" in
+- *apple-darwin*)
+- AC_MSG_WARN([*** It is not possible to build the LAM/MPI supporting])
+- AC_MSG_WARN([*** infrastructure on Darwin or Mac OS X without static])
+- AC_MSG_WARN([*** libraries. Note that you can build both shared and])
+- AC_MSG_WARN([*** static libraries and link your applications against])
+- AC_MSG_WARN([*** the shared libraries.])
+- AC_MSG_ERROR([Can not continue])
+- ;;
+- esac
+-fi
+-
+-
+ ############################################################################
+ # Check for maintainer mode (secret sauce)
+ ############################################################################
+@@ -821,17 +807,6 @@ if test "$WANT_ROMIO" = "yes"; then
+ esac
fi
- chmod a+x $file
- fi ;;
-- share/memory/darwin7/Makefile ) if test "$WANT_ROMIO" = "yes"; then
-- file=romio/util/lam-configure-values
-- if test ! -f $file; then
-- echo : > $file
-- fi
-- chmod a+x $file
--fi ;;
- share/memory/ptmalloc/Makefile ) if test "$WANT_ROMIO" = "yes"; then
- file=romio/util/lam-configure-values
- if test ! -f $file; then
+
+- # Pass ROMIO architecture on OSX, as it can't figure it out...
+- case "$host" in
+- *apple-darwin*)
+- ROMIO_ARCH_FLAGS="-arch=freebsd"
+- ;;
+- *)
+- ROMIO_ARCH_FLAGS=
+- ;;
+- esac
+-
+-
+ AC_DEFINE(LAM_WANT_ROMIO, 1)
+ else
+ AC_DEFINE(LAM_WANT_ROMIO, 0)
+@@ -2457,7 +2432,6 @@ AC_CONFIG_FILES([
+ share/pmpi/Makefile
+ share/pmpi/f77/Makefile
+ share/memory/Makefile
+- share/memory/darwin7/Makefile
+ share/memory/ptmalloc/Makefile
+ share/memory/ptmalloc2/Makefile
+ share/rreq/Makefile
Index: lam.module.in
===================================================================
RCS file: /cvs/extras/rpms/lam/F-8/lam.module.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lam.module.in 17 May 2007 18:13:22 -0000 1.3
+++ lam.module.in 25 Jun 2008 18:27:08 -0000 1.4
@@ -1,7 +1,8 @@
#%Module 1.0
#
# LAM module for use with 'environment-modules' package:
-#
-prepend-path LD_LIBRARY_PATH @LIBDIR@/lam
-setenv CFLAGS -I at INCLUDEDIR@/lam -I at INCLUDEDIR@/lam/@MODE@
-setenv LDFLAGS -L at LIBDIR@/lam
+#
+prepend-path PATH @LAMDIR@/bin
+prepend-path LD_LIBRARY_PATH @LAMDIR@/lib
+setenv CFLAGS -I at LAMDIR@/include
+setenv LDFLAGS -L at LAMDIR@/lib
Index: lam.pc.in
===================================================================
RCS file: /cvs/extras/rpms/lam/F-8/lam.pc.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lam.pc.in 12 Oct 2006 15:07:27 -0000 1.2
+++ lam.pc.in 25 Jun 2008 18:27:08 -0000 1.3
@@ -3,5 +3,5 @@
Description: The LAM (Local Area Multicomputer) programming environment.
URL: http://www.lam-mpi.org/
Version: @VERSION@
-Libs: -L at LIBDIR@ -lmpi
-Cflags: -I at INCLUDEDIR@ -I at INCLUDEDIR@/@MODE@
+Libs: -L at LAMDIR@/lib -lmpi
+Cflags: -I at LAMDIR@/include
Index: lam.spec
===================================================================
RCS file: /cvs/extras/rpms/lam/F-8/lam.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- lam.spec 17 May 2007 18:13:22 -0000 1.45
+++ lam.spec 25 Jun 2008 18:27:08 -0000 1.46
@@ -1,7 +1,7 @@
Summary: The LAM (Local Area Multicomputer) programming environment.
Name: lam
-Version: 7.1.2
-Release: 10%{?dist}
+Version: 7.1.4
+Release: 1%{?dist}
License: BSD
Epoch: 2
Group: Development/Libraries
@@ -9,14 +9,14 @@
Source1: lam.pc.in
Source2: lam.module.in
Patch0: lam-7.1.2-no_darwin.patch
-Patch1: lam-7.1.2-archinc.patch
+Patch1: lam-7.1.2-archmode.patch
+Patch2: lam-gcc43-build.patch
URL: http://www.lam-mpi.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: perl gcc gcc-c++ gcc-gfortran libaio libaio-devel autoconf automake libtool
-Requires: openssh-server openssh-clients libaio libaio-devel gcc gcc-c++ gcc-gfortran
-Requires(post): /sbin/ldconfig, /usr/sbin/alternatives
-Requires(preun): /usr/sbin/alternatives
+BuildRequires: perl gcc gcc-c++ gcc-gfortran libaio-devel automake libtool
+Requires: openssh-server openssh-clients
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires(post): chkconfig
%description
LAM (Local Area Multicomputer) is an Message-Passing Interface (MPI)
@@ -47,8 +47,8 @@
%package libs
Summary: Libraries for LAM
Group: System/Libraries
-Requires(post): /sbin/ldconfig, /usr/sbin/alternatives
-Requires(preun): /usr/sbin/alternatives
+Requires(post): /sbin/ldconfig chkconfig
+Requires: environment-modules
%description libs
Runtime libraries for LAM
@@ -57,16 +57,22 @@
Summary: Development files for LAM
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires(post): /sbin/ldconfig, /usr/sbin/alternatives
-Requires(preun): /usr/sbin/alternatives
+Requires: libaio-devel gcc gcc-c++ gcc-gfortran
+Requires(post): chkconfig
%description devel
Contains development headers and libraries for LAM
+%define mpidir %{_libdir}/%{name}
+
%prep
%setup -q -n lam-%{version}-rh1
%patch0 -p1 -b .no_darwin
-%patch1 -p1 -b .archinc
+%ifarch i386 x86_64 ppc ppc64 s390 s390x
+%patch1 -p1 -b .archmode
+%endif
+%patch2 -p1 -b .gcc43
+autoreconf
%build
%ifarch x86_64
@@ -77,55 +83,35 @@
%ifarch i386 ppc
%define mode 32
-%else
- %ifarch s390
- %define mode 31
- %else
- %define mode 64
- %endif
%endif
-%ifarch i386 ppc64 s390
-%define priority 5
-%else
-%define priority 6
+%ifarch s390
+%define mode 31
+%endif
+%ifarch s390x x86_64 ppc64
+%define mode 64
%endif
+%ifarch i386 x86_64 ppc ppc64 s390 s390x
export CPPFLAGS="-DLAM_MODE=\\\"%{mode}\\\""
+%endif
export FC=f95
%ifarch i386 s390 ppc
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/%{name} --includedir=%{_includedir}/%{name} --sysconfdir=%{_sysconfdir}/%{name} --with-trillium --enable-shared --program-transform-name='s/^mpi/lam/' --disable-deprecated-executable-names
+./configure --with-rsh="/usr/bin/ssh -x -a" --prefix=%{mpidir} --exec-prefix=%{mpidir} --datadir=%{mpidir} --mandir=%{mpidir}/man --with-trillium --enable-shared --disable-deprecated-executable-names
%else
#
# Disable TotalView on non-32 bit architectures.
#
-%configure --with-rsh="/usr/bin/ssh -x -a" --libdir=%{_libdir}/%{name} --includedir=%{_includedir}/%{name} --sysconfdir=%{_sysconfdir}/%{name} --disable-tv --disable-tv-dll --with-trillium --enable-shared --program-transform-name='s/^mpi/lam/' --disable-deprecated-executable-names
+./configure --with-rsh="/usr/bin/ssh -x -a" --prefix=%{mpidir} --exec-prefix=%{mpidir} --datadir=%{mpidir} --mandir=%{mpidir}/man --disable-tv --disable-tv-dll --with-trillium --enable-shared --disable-deprecated-executable-names
%endif
make %{?_smp_mflags} all
%install
-[ ! -z "${RPM_BUILD_ROOT}" ] && rm -rf ${RPM_BUILD_ROOT}
+rm -rf ${RPM_BUILD_ROOT}
make DESTDIR=${RPM_BUILD_ROOT} install
-# ? commented this out (JVD, 2005-07-08):
-# Can't open usr/bin/balky: No such file or directory.
-#pushd ${RPM_BUILD_ROOT}
-# balky has buildroot paths in the binary
-#perl -pi -e "s|(.*=).*hcp|\1/usr/bin/hcp|g" usr/bin/balky
-#popd
-
-# Make the arch specific headers include arch name to avoid conflicts when
-# installing multiple devel environments on multilib arches
-mkdir ${RPM_BUILD_ROOT}%{_includedir}/lam/%{mode}
-for file in lam_build_info.h lam_config.h; do
- mv ${RPM_BUILD_ROOT}%{_includedir}/lam/${file} ${RPM_BUILD_ROOT}%{_includedir}/lam/%{mode}
-done
-for file in lamcc lamc++ lamf77; do
- mv ${RPM_BUILD_ROOT}%{_bindir}/${file}{,-%{mode}}
-done
-
# mans isn't a standard mandir (#67595) and contains a copy of man7/mpi.7
-rm -fr ${RPM_BUILD_ROOT}%{_mandir}/mans
+rm -fr ${RPM_BUILD_ROOT}%{mpidir}/man/mans
ln -f romio/COPYRIGHT romio/ROMIO-COPYRIGHT
ln -f romio/doc/README romio/ROMIO-README
@@ -134,105 +120,104 @@
# Remove .la files:
find ${RPM_BUILD_ROOT}%{_libdir} -name \*.la | xargs rm
+# Remove some doc files we don't want where they are...
+rm -rf ${RPM_BUILD_ROOT}%{mpidir}/lam
-# Remove wrong doc directory location (files shipped in %doc):
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/lam
-#
-#
-# Make LAM coexist with OpenMPI:
-#
-# Clashes with OpenMPI: mpic++ mpicc mpif77 mpiexec mpirun
-
-echo %{_libdir}/%{name} > ${RPM_BUILD_ROOT}%{_libdir}/%{name}/%{name}.ld.conf
# Create the lam.pc pkgconfig file:
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
-sed 's#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}/%{name}'#g;s#@INCLUDEDIR@#'%{_includedir}/%{name}'#g;s#@MODE@#'%{mode}'#g' < %SOURCE1 > ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/%{name}.pc
-sed 's#@LIBDIR@#'%{_libdir}'#g;s#@MODE@#'%{mode}'#g;s#@INCLUDEDIR@#'%{_includedir}'#g' < %SOURCE2 > ${RPM_BUILD_ROOT}%{_libdir}/%{name}/%{name}.module
+sed 's#@VERSION@#'%{version}'#g;s#@LAMDIR@#'%{mpidir}'#g' < %SOURCE1 > ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/%{name}.pc
+sed 's#@LAMDIR@#'%{mpidir}'#g' < %SOURCE2 > ${RPM_BUILD_ROOT}%{mpidir}/%{name}.module
for i in hcc hcp hf77
do
- rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/$i.1*
+ rm -f ${RPM_BUILD_ROOT}%{mpidir}/man/man1/$i.1*
done
%clean
-[ ! -z "${RPM_BUILD_ROOT}" ] && rm -rf ${RPM_BUILD_ROOT}
+rm -rf ${RPM_BUILD_ROOT}
%post
-alternatives --install %{_bindir}/mpirun mpi-run %{_bindir}/lamrun \
- %{priority} --slave %{_bindir}/mpiexec mpi-exec %{_bindir}/lamexec \
- --slave %{_mandir}/man1/mpirun.1.gz mpi-run-man \
- %{_mandir}/man1/lamrun.1.gz \
- --slave %{_mandir}/man1/mpiexec.1.gz mpi-exec-man \
- %{_mandir}/man1/lamexec.1.gz
-
-%preun
-if [ "$1" -eq 0 ]; then
- alternatives --remove mpi-run %{_bindir}/lamrun
-fi
+alternatives --remove mpi-run %{_bindir}/lamrun >/dev/null 2>&1 ||:
%post libs
-alternatives --install %{_sysconfdir}/ld.so.conf.d/mpi%{mode}.conf \
- mpilibs%{mode} %{_libdir}/lam/lam.ld.conf %{priority}
+%ifarch ia64
+alternatives --remove mpilibs64 %{_libdir}/lam/lam.ld.conf >/dev/null 2>&1
+%else
+alternatives --remove mpilibs%{mode} %{_libdir}/lam/lam.ld.conf >/dev/null 2>&1
+%endif
+alternatives --remove mpilibs %{_libdir}/lam/lam.ld.conf >/dev/null 2>&1
/sbin/ldconfig
-%preun libs
-alternatives --remove mpilibs%{mode} %{_libdir}/lam/lam.ld.conf
-
%postun libs -p /sbin/ldconfig
%post devel
-alternatives --install %{_bindir}/mpicc mpicc \
- '%{_bindir}/lamcc-%{mode}' %{priority} \
- --slave %{_bindir}/mpic++ mpic++ '%{_bindir}/lamc++-%{mode}' \
- --slave %{_bindir}/mpiCC mpiCC '%{_bindir}/lamc++-%{mode}' \
- --slave %{_bindir}/mpif77 mpif77 '%{_bindir}/lamf77-%{mode}'
-/sbin/ldconfig
-
-%preun devel
-alternatives --remove mpicc %{_bindir}/lamcc-%{mode}
-
-%postun devel -p /sbin/ldconfig
+alternatives --remove mpicc %{_bindir}/lamcc-%{mode} >/dev/null 2>&1 ||:
%files
%defattr(-,root,root,-)
%doc LICENSE HISTORY INSTALL README AUTHORS
%doc doc/user.pdf doc/install.pdf
%doc share/memory/ptmalloc/ptmalloc-COPYRIGHT share/memory/ptmalloc2/ptmalloc2-COPYRIGHT
-%config(noreplace) %{_sysconfdir}/%{name}
-%{_bindir}/*
-%exclude %{_bindir}/lamc++-%{mode}
-%exclude %{_bindir}/lamcc-%{mode}
-%exclude %{_bindir}/lamf77-%{mode}
-%{_mandir}/*/*
+%dir %{mpidir}/etc
+%dir %{mpidir}/bin
+%config(noreplace) %{mpidir}/etc/lam-bhost.def
+%config(noreplace) %{mpidir}/etc/lam-conf.lamd
+%config(noreplace) %{mpidir}/etc/lam-hostmap.txt
+%config() %{mpidir}/etc/lam*helpfile
+%{mpidir}/bin/*
+%exclude %{mpidir}/bin/mpic++
+%exclude %{mpidir}/bin/mpicc
+%exclude %{mpidir}/bin/mpif77
+%{mpidir}/man/man[157]/*
%files libs
%defattr(-,root,root,-)
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/lam.ld.conf
-%{_libdir}/%{name}/*.so.*
+%dir %{mpidir}
+%{mpidir}/lam.module
+%dir %{mpidir}/lib
+%{mpidir}/lib/*.so.*
%ifarch i386 s390 ppc
# TotalView modules
-%dir %{_libdir}/%{name}/lam
-%{_libdir}/%{name}/lam/*.so*
+%dir %{mpidir}/lib/lam
+%{mpidir}/lib/lam/*.so*
%endif
%files devel
%defattr(-,root,root,-)
%doc romio/ROMIO-COPYRIGHT romio/ROMIO-README romio/ROMIO-README_LAM romio/doc/romio-users-guide.ps.gz
-%{_bindir}/lamc++-%{mode}
-%{_bindir}/lamcc-%{mode}
-%{_bindir}/lamf77-%{mode}
-%{_includedir}/%{name}
-%{_libdir}/%{name}/*.a
-%{_libdir}/%{name}/*.so
-%{_libdir}/%{name}/lam.module
+%{mpidir}/bin/mpic++
+%{mpidir}/bin/mpicc
+%{mpidir}/bin/mpif77
+%dir %{mpidir}/include
+%{mpidir}/include/*
+%{mpidir}/lib/*.a
+%{mpidir}/lib/*.so
+%config %{_libdir}/pkgconfig/%{name}.pc
%ifarch i386 s390 ppc
# TotalView modules
-%{_libdir}/%{name}/lam/*.so
+%{mpidir}/lib/lam/*.so
%endif
-%config %{_libdir}/pkgconfig/%{name}.pc
+%{mpidir}/man/man[23]/*
%changelog
+* Tue Jun 24 2008 Doug Ledford <dledford at redhat.com> - 2:7.1.4-1
+- Update to latest upstream version
+- Make sure to remove APSL licensed files from upstream tarball and rename
+ tarball to version-rh1 to indicate such
+- Make lam exist in its own prefix, which forestalls all conflicts with other
+ mpi implementations and also eliminates the need for an alternatives setup
+- Make environment-modules required for lam-libs and the default means of
+ selecting between lam/openmpi/other mpi implementations
+- Only apply the archmode patch on arches where gcc will accept a mode flag
+- Make sure we remove any stale lam alternatives configs when we install so
+ that upgrades will work properly
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2:7.1.2-12
+- Autorebuild for GCC 4.3
+
+* Fri Jan 18 2008 Doug Ledford <dledford at redhat.com> - 2:7.1.2-11
+- Bump and rebuild
+
* Thu May 17 2007 Doug Ledford <dledford at redhat.com> - 2:7.1.2-10.fc6
- Fix the sed substitutions to be global so they catch all the items
that need to be substituted
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lam/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 4 Oct 2006 06:32:17 -0000 1.14
+++ sources 25 Jun 2008 18:27:08 -0000 1.15
@@ -1 +1 @@
-59c26dfcda2c0c3ff66bdc924c647f69 lam-7.1.2-rh1.tar.bz2
+a1ad17155294908327bdd3b6516a7df7 lam-7.1.4-rh1.tar.bz2
--- lam-7.1.2-archinc.patch DELETED ---
More information about the fedora-extras-commits
mailing list