[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/lam/FC-5 lam-7.1.2-archinc.patch, NONE, 1.1 lam-7.1.2-no_darwin.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 lam.module.in, 1.1, 1.2 lam.pc.in, 1.1, 1.2 lam.spec, 1.34, 1.35 sources, 1.12, 1.13 lam-7.1.1-f77-f95.patch, 1.3, NONE relpath.sh, 1.1, NONE



Author: dledford

Update of /cvs/dist/rpms/lam/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30157

Modified Files:
	.cvsignore lam.module.in lam.pc.in lam.spec sources 
Added Files:
	lam-7.1.2-archinc.patch lam-7.1.2-no_darwin.patch 
Removed Files:
	lam-7.1.1-f77-f95.patch relpath.sh 
Log Message:
Update to match fc6 lam

lam-7.1.2-archinc.patch:
 wrap.cc     |    3 +++
 wrap_cc.cc  |    3 +++
 wrap_cxx.cc |    3 +++
 wrap_f77.cc |    3 +++
 4 files changed, 12 insertions(+)

--- NEW FILE lam-7.1.2-archinc.patch ---
--- lam-7.1.2-rh1/tools/wrappers/wrap_cxx.cc.archinc	2006-02-23 18:27:02.000000000 -0500
+++ lam-7.1.2-rh1/tools/wrappers/wrap_cxx.cc	2006-10-04 00:23: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,8 @@ lam_wrap_build_cflags(bool want_cxx_incl
 
   if (want_f77_includes || incdir != "/usr/include") 
     cflags.push_back("-I" + incdir);
+  cflags.push_back("-I" + incdir + "/" + mode);
+  cflags.push_back("-m" + mode);
 }
 
 
--- lam-7.1.2-rh1/tools/wrappers/wrap_f77.cc.archinc	2006-02-23 18:27:02.000000000 -0500
+++ lam-7.1.2-rh1/tools/wrappers/wrap_f77.cc	2006-10-04 00:23:21.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,8 @@ lam_wrap_build_cflags(bool want_cxx_incl
 
   if (want_f77_includes || incdir != "/usr/include") 
     cflags.push_back("-I" + incdir);
+  cflags.push_back("-I" + incdir + "/" + mode);
+  cflags.push_back("-m" + mode);
 }
 
 
--- lam-7.1.2-rh1/tools/wrappers/wrap.cc.archinc	2006-02-23 18:27:02.000000000 -0500
+++ lam-7.1.2-rh1/tools/wrappers/wrap.cc	2006-10-04 00:23:06.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,8 @@ lam_wrap_build_cflags(bool want_cxx_incl
 
   if (want_f77_includes || incdir != "/usr/include") 
     cflags.push_back("-I" + incdir);
+  cflags.push_back("-I" + incdir + "/" + mode);
+  cflags.push_back("-m" + mode);
 }
 
 
--- lam-7.1.2-rh1/tools/wrappers/wrap_cc.cc.archinc	2006-02-23 18:27:02.000000000 -0500
+++ lam-7.1.2-rh1/tools/wrappers/wrap_cc.cc	2006-10-04 00:21: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,8 @@ lam_wrap_build_cflags(bool want_cxx_incl
 
   if (want_f77_includes || incdir != "/usr/include") 
     cflags.push_back("-I" + incdir);
+  cflags.push_back("-I" + incdir + "/" + mode);
+  cflags.push_back("-m" + mode);
 }
 
 

lam-7.1.2-no_darwin.patch:
 configure                |   12 ++----------
 share/memory/Makefile.am |    6 +-----
 share/memory/Makefile.in |    7 +------
 3 files changed, 4 insertions(+), 21 deletions(-)

--- NEW FILE lam-7.1.2-no_darwin.patch ---
--- 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 libmemory_la_DEPENDENCIES = ptmalloc/libptmalloc.la
 @LAM_WANT_DARWIN7MALLOC_FALSE@@LAM_WANT_PTMALLOC2_TRUE libmemory_la_DEPENDENCIES = ptmalloc2/libptmalloc2.la
- LAM_WANT_DARWIN7MALLOC_TRUE@libmemory_la_DEPENDENCIES =  \
- 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
- LAM_WANT_DARWIN7MALLOC_TRUE@libmemory_la_LIBADD = \
- LAM_WANT_DARWIN7MALLOC_TRUE@			darwin7/libdarwin7malloc.la
-
 @LAM_WANT_PTMALLOC2_TRUE 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
@@ -14,7 +14,7 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-SUBDIRS			= ptmalloc ptmalloc2 darwin7
+SUBDIRS			= ptmalloc ptmalloc2
 
 noinst_LTLIBRARIES	= libmemory.la
 libmemory_la_SOURCES	= memory_hook.c
@@ -29,7 +29,3 @@ libmemory_la_LIBADD	= \
 			ptmalloc2/libptmalloc2.la
 endif
 
-if LAM_WANT_DARWIN7MALLOC
-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/Mak!
 efile ot
b/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/Makefi!
 le 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/Makefi!
 le share/threads/Makefile share/trillium/Makefile share/tstdio!
 /Makefil
e 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/Mak!
 efile ot
b/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/Makefi!
 le 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 shar!
 e/trillium/Makefile share/tstdio/Makefile tools/Makefile tools!
 /hboot/M
akefile 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 ;;
     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


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/lam/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	12 Jun 2006 22:21:40 -0000	1.12
+++ .cvsignore	13 Oct 2006 15:04:26 -0000	1.13
@@ -1,3 +1,4 @@
 lam-7.0.6.tar.bz2
 lam-7.1.1.tar.bz2
 lam-7.1.2.tar.bz2
+lam-7.1.2-rh1.tar.bz2


Index: lam.module.in
===================================================================
RCS file: /cvs/dist/rpms/lam/FC-5/lam.module.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lam.module.in	17 Feb 2006 22:32:02 -0000	1.1
+++ lam.module.in	13 Oct 2006 15:04:26 -0000	1.2
@@ -2,8 +2,6 @@
 #
 #  LAM module for use with 'environment-modules' package:
 # 
-prepend-path 		PATH 		@DATADIR@/@NAME@/bin
-prepend-path 		LD_LIBRARY_PATH @DATADIR@/@NAME@/lib
-prepend-path 		MANPATH         @DATADIR@/@NAME@/man
-setenv			CFLAGS		-I DATADIR@/@NAME@/include
-setenv			LDFLAGS		-L DATADIR@/@NAME@/lib
+prepend-path 		LD_LIBRARY_PATH @LIBDIR@/@NAME@
+setenv			CFLAGS		-I INCLUDEDIR@/@NAME@
+setenv			LDFLAGS		-L LIBDIR@/@NAME@


Index: lam.pc.in
===================================================================
RCS file: /cvs/dist/rpms/lam/FC-5/lam.pc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lam.pc.in	17 Feb 2006 22:32:02 -0000	1.1
+++ lam.pc.in	13 Oct 2006 15:04:26 -0000	1.2
@@ -4,4 +4,4 @@
 URL:		http://www.lam-mpi.org/
 Version:	@VERSION@
 Libs:		-L LIBDIR@ -lmpi
-Cflags: 	-I INCLUDEDIR@
+Cflags: 	-I INCLUDEDIR@ -I INCLUDEDIR@/@MODE@


Index: lam.spec
===================================================================
RCS file: /cvs/dist/rpms/lam/FC-5/lam.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- lam.spec	12 Jun 2006 22:21:40 -0000	1.34
+++ lam.spec	13 Oct 2006 15:04:26 -0000	1.35
@@ -1,22 +1,22 @@
 Summary: The LAM (Local Area Multicomputer) programming environment.
 Name: lam
 Version: 7.1.2
-Release: 1.fc5
+Release: 8%{?dist}
 License: BSD
 Epoch: 2
 Group: Development/Libraries
-Source: http://www.lam-mpi.org/download/files/lam-%{version}.tar.bz2
-Source1: relpath.sh
-Source2: lam.pc.in
-Source3: lam.module.in
+Source: lam-%{version}-rh1.tar.bz2
+Source1: lam.pc.in
+Source2: lam.module.in
+Patch0: lam-7.1.2-no_darwin.patch
+Patch1: lam-7.1.2-archinc.patch
 URL: http://www.lam-mpi.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+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: %{name}-libs = %{epoch}:%{version}-%{release}
 
-%{?!LAMbinpfx: %define LAMbinpfx 'lam-'} # prefix for LAM binaries that clash with OpenMPI
-
 %description 
 LAM (Local Area Multicomputer) is an Message-Passing Interface (MPI)
 programming environment and development system for heterogeneous
@@ -59,7 +59,9 @@
 Contains development headers and libraries for LAM
 
 %prep
-%setup -q -n lam-%{version}
+%setup -q -n lam-%{version}-rh1
+%patch0 -p1 -b .no_darwin
+%patch1 -p1 -b .archinc
 
 %build
 %ifarch x86_64
@@ -67,127 +69,192 @@
 CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
 FFLAGS="$RPM_OPT_FLAGS -fPIC"
 %endif 
+
+%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
+%endif
+
+export CPPFLAGS="-DLAM_MODE=\\\"%{mode}\\\""
 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
+%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
 %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
+%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
 %endif
 
 make %{?_smp_mflags} all
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+[ ! -z "${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
+#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}%{_mandir}/mans
 
 ln -f romio/COPYRIGHT romio/ROMIO-COPYRIGHT
 ln -f romio/doc/README romio/ROMIO-README
 ln -f romio/doc/users-guide.ps.gz romio/doc/romio-users-guide.ps.gz 
 ln -f romio/README_LAM romio/ROMIO-README_LAM
 
-# FIXME: sanitize /usr/include/lam_config.h for bi-arch - huh ?
-
 # Remove .la files:
 find ${RPM_BUILD_ROOT}%{_libdir} -name \*.la | xargs rm
 
 # Remove wrong doc directory location (files shipped in %doc): 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/lam
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/lam
 #
 #
 # Make LAM coexist with OpenMPI:
 #
-# Make /usr/share/lam environment-modules directory:
-. %SOURCE1
-# ^- provides "relpath" function
-rpath=`relpath ${RPM_BUILD_ROOT}/%{_bindir} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/bin`;
-mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/bin;
-ln -s `relpath ${RPM_BUILD_ROOT}/%{_libdir}/%{name} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}` ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/lib;
-ln -s `relpath ${RPM_BUILD_ROOT}/%{_includedir}/%{name} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}` ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/include;
-# Links: (mpiCC,mpicxx)->mpicc,  (mpiexec,mpirun)->orterun
 # Clashes with OpenMPI: mpic++ mpicc mpif77 mpiexec mpirun
-for b in mpirun mpiexec mpicc mpic++ mpif77 ; do
-  mv $RPM_BUILD_ROOT/%{_bindir}/$b $RPM_BUILD_ROOT/%{_bindir}/%{LAMbinpfx}$b; 
-  ln -s ./%{LAMbinpfx}$b $RPM_BUILD_ROOT/%{_bindir}/$b;
-  ln -s ${rpath}/%{LAMbinpfx}${b} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/bin/${b};
-done;
-# Create the binaries in /usr/share/lam/bin for environment-modules environment:
-(cd ${RPM_BUILD_ROOT}/%{_bindir}; ls) | egrep -v '^(mpirun mpiexec mpicc mpic\+\+ mpif77)$' |
-while read b; do
-  ln -s ${rpath}/${b} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/bin/${b};
-done;
-# Create the /usr/lib/*.so links for existing software that links with LAM 
-# - only libmpi.so actually clashes with OpenMPI, which can be made into an alternative(8):
-#(cd ${RPM_BUILD_ROOT}/%{_libdir}/%{name}; ls *.so) | while read l; do
-#    ln -s ./%{name}/$l $RPM_BUILD_ROOT/%{_libdir}/$l;
-#done;
-# 
-# Create the ldconfig file for LAM
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d
-# The default mpi ld.so conf file (managed by openmpi's mpi_alternatives):
-touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/ld.so.conf.d/mpi.conf
-echo %{_libdir}/%{name} > ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/ld.conf
+
+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}'#;s# LIBDIR@#'%{_libdir}/%{name}'#;s# INCLUDEDIR@#'%{_includedir}/%{name}'#' < %SOURCE2 > ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig/%{name}.pc;
-# Move man pages to /usr/share/lam/man :
-mv ${RPM_BUILD_ROOT}/%{_mandir} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/man
-sed 's# DATADIR@#'%{_datadir}/%{name}'#;s# NAME@#'%{name}'#' < %SOURCE3 > ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/%{name}.module
-:;
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
+sed 's# VERSION@#'%{version}'#;s# LIBDIR@#'%{_libdir}/%{name}'#;s# INCLUDEDIR@#'%{_includedir}/%{name}'#;s# MODE@#'%{mode}'#' < %SOURCE1 > ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/%{name}.pc
+sed 's# LIBDIR@#'%{_libdir}'#;s# NAME@#'%{name}'#;s# INCLUDEDIR@#'%{_includedir}'#' < %SOURCE2 > ${RPM_BUILD_ROOT}%{_libdir}/%{name}/%{name}.module
+
+for i in hcc hcp hf77
+do
+    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/$i.1*
+done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+[ ! -z "${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
+
+%post libs
+alternatives --install %{_sysconfdir}/ld.so.conf.d/mpi%{mode}.conf \
+			mpilibs%{mode} %{_libdir}/lam/lam.ld.conf %{priority}
+/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
 
 %files
 %defattr(-,root,root)
 %doc LICENSE HISTORY INSTALL README AUTHORS
 %doc doc/user.pdf doc/install.pdf
-%doc share/memory/darwin7/APPLE_LICENSE share/memory/ptmalloc/ptmalloc-COPYRIGHT share/memory/ptmalloc2/ptmalloc2-COPYRIGHT
+%doc share/memory/ptmalloc/ptmalloc-COPYRIGHT share/memory/ptmalloc2/ptmalloc2-COPYRIGHT
 %config(noreplace) %{_sysconfdir}/%{name}
-%ghost %{_sysconfdir}/ld.so.conf.d/mpi.conf
 %{_bindir}/*
-%{_datadir}/%{name}
+%exclude %{_bindir}/lamc++-%{mode}
+%exclude %{_bindir}/lamcc-%{mode}
+%exclude %{_bindir}/lamf77-%{mode}
+%{_mandir}/*/*
 
 %files libs
 %defattr(-,root,root)
 %dir %{_libdir}/%{name}
+%{_libdir}/%{name}/lam.ld.conf
 %{_libdir}/%{name}/*.so.*
 %ifarch i386 s390 ppc
+# TotalView modules
 %dir %{_libdir}/%{name}/lam
-%{_libdir}/%{name}/lam/*.so.*
+%{_libdir}/%{name}/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
 %ifarch i386 s390 ppc
+# TotalView modules
 %{_libdir}/%{name}/lam/*.so
 %endif
 %config %{_libdir}/pkgconfig/%{name}.pc
 
-%post
-if [ $1 -ge 1 ]; then
-   if [ ! -e %{_sysconfdir}/ld.so.conf.d/mpi.conf ]; then
-	ln -s %{_datadir}/%{name}/ld.conf  %{_sysconfdir}/ld.so.conf.d/mpi.conf;
-   fi;
-fi;
-
 %changelog
+* Fri Oct 13 2006 Doug Ledford <dledford redhat com> - 2:7.1.2-8.fc6
+- @!#^!@ copy-n-paste error...fix up incorrect priority so alternatives will
+  work again
+
+* Wed Oct 11 2006 Doug Ledford <dledford redhat com> - 2:7.1.2-6.fc6
+- Fix alternatives setup of mpi.conf in /etc/ld.so.conf.d so we find both
+  sets of libs on multilib arches
+
+* Sun Oct 08 2006 Doug Ledford <dledford redhat com> - 2:7.1.2-5.fc6
+- Add s390x into the mode/priority config list
+
+* Tue Oct 03 2006 Doug Ledford <dledford redhat com> - 2:7.1.2-4.fc6
+- Remove Apple Public Source License licensed files from the tarball (they
+  aren't used anyway since we aren't the Darwin OS, but the license language
+  is problematic for people distributing the files regardless) (bz205998)
+- Fix up file conflicts for lam_build_info.h and lam_config.h (bz205218)
+
+* Sun Aug 27 2006 Doug Ledford <dledford redhat com> - 2:7.1.2-3.fc6
+- Make the %post and %preun only run at the right times (new install and
+  final package removal)
+
+* Fri Aug 25 2006 Doug Ledford <dledford redhat com> - 2:7.1.2-2.fc6
+- Get rid of mpi_alternatives and just use alternatives to match openmpi
+
+* Wed Jul 12 2006 Jesse Keating <jkeating redhat com> - 2:7.1.2-1.fc6.1
+- rebuild
+
 * Mon Jun 12 2006 Jason Vas Dias<jvdias redhat com> - 2:7.1.2-1.fc6
 - Upgrade to upstream version 7.1.2
 - fix bug 191433 - Split into -libs and -devel packages


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/lam/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	12 Jun 2006 22:21:40 -0000	1.12
+++ sources	13 Oct 2006 15:04:26 -0000	1.13
@@ -1 +1 @@
-07c59cf03c773a67199e066e500e499b  lam-7.1.2.tar.bz2
+59c26dfcda2c0c3ff66bdc924c647f69  lam-7.1.2-rh1.tar.bz2


--- lam-7.1.1-f77-f95.patch DELETED ---


--- relpath.sh DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]