Blame SOURCES/mpitests-3.2-make.patch

2e3fb2
--- mpitests-3.2/osu_benchmarks-3.1.1/makefile.make	2009-11-15 10:09:58.000000000 -0500
2e3fb2
+++ mpitests-3.2/osu_benchmarks-3.1.1/makefile	2010-01-17 10:01:53.102371618 -0500
2e3fb2
@@ -1,6 +1,5 @@
2e3fb2
 SHELL		= /bin/sh
2e3fb2
-prefix		= /usr/local
2e3fb2
-CC		= ${MPIHOME}/bin/mpicc
2e3fb2
+CC		= mpicc
2e3fb2
 
2e3fb2
 .SUFFIXES:
2e3fb2
 .SUFFIXES: .c .o
2e3fb2
@@ -22,9 +21,9 @@ osu_bcast: osu_bcast.c
2e3fb2
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -lm -o osu_bcast osu_bcast.c $(LDLIBS)
2e3fb2
 
2e3fb2
 install:
2e3fb2
-	test -d $(prefix)/osu_benchmarks || mkdir $(prefix)/osu_benchmarks
2e3fb2
+	test -d $(DESTDIR)$(INSTALL_DIR) || mkdir -p $(DESTDIR)$(INSTALL_DIR)
2e3fb2
 	for benchmark in $(ALL_BENCHMARKS); do\
2e3fb2
-	    test -x $$benchmark && cp $$benchmark $(prefix)/osu_benchmarks;\
2e3fb2
+	    test -x $$benchmark && cp $$benchmark $(DESTDIR)$(INSTALL_DIR)/mpitests-$$benchmark || /bin/true;\
2e3fb2
 	done
2e3fb2
 
2e3fb2
 clean:
2e3fb2
--- mpitests-3.2/IMB-3.2/src/Makefile.base.make	2009-11-15 10:09:58.000000000 -0500
2e3fb2
+++ mpitests-3.2/IMB-3.2/src/Makefile.base	2010-01-17 10:06:29.888371547 -0500
2e3fb2
@@ -59,12 +59,20 @@ EXT : $(OBJEXT) 
2e3fb2
 IO: $(OBJIO) 
2e3fb2
 	$(CLINKER) $(LDFLAGS) -o IMB-IO $(OBJIO)  $(LIB_PATH) $(LIBS)
2e3fb2
 
2e3fb2
+install:
2e3fb2
+	mkdir -p ${DESTDIR}; \
2e3fb2
+	for benchmark in IMB-MPI1 IMB-EXT IMB-IO; do \
2e3fb2
+	    if [ -e $$benchmark ]; then \
2e3fb2
+	        cp $$benchmark ${DESTDIR}${INSTALL_DIR}/mpitests-$$benchmark; \
2e3fb2
+	    fi; \
2e3fb2
+	done
2e3fb2
+
2e3fb2
 # Make sure that we remove executables for specific architectures
2e3fb2
 clean:
2e3fb2
 	/bin/rm -f *.o *~ PI* core IMB-IO IMB-EXT IMB-MPI1 exe_io exe_ext exe_mpi1
2e3fb2
 
2e3fb2
 .c.o:
2e3fb2
-	$(CC) $(MPI_INCLUDE) $(CPPFLAGS) -D$(CPP) $(OPTFLAGS) -c $*.c
2e3fb2
+	$(CC) $(CPPFLAGS) -D$(CPP) $(OPTFLAGS) -c $*.c
2e3fb2
 
2e3fb2
 # DEPENDENCIES
2e3fb2
 IMB_declare.h:	IMB_settings.h IMB_comm_info.h IMB_settings_io.h IMB_bnames_mpi1.h \
2e3fb2
--- mpitests-3.2/IMB-3.2/src/Makefile.make	2009-11-15 10:09:58.000000000 -0500
2e3fb2
+++ mpitests-3.2/IMB-3.2/src/Makefile	2010-01-17 10:01:53.101371937 -0500
2e3fb2
@@ -1,21 +1,9 @@
2e3fb2
 # Enter root directory of mpich install
2e3fb2
-MPI_HOME=$(MPIHOME)
2e3fb2
-
2e3fb2
-MPICC=$(shell find ${MPI_HOME} -name mpicc -print)
2e3fb2
-
2e3fb2
-NULL_STRING :=
2e3fb2
-ifneq (,$(findstring /bin/mpicc,${MPICC}))
2e3fb2
-MPI_INCLUDE := -I${MPI_HOME}/include
2e3fb2
-else
2e3fb2
-$(error Variable MPI_HOME="${MPI_HOME}" does not seem to contain a valid mpicc)
2e3fb2
-endif
2e3fb2
-LIB_PATH    =
2e3fb2
-LIBS        = 
2e3fb2
-CC          = ${MPI_HOME}/bin/mpicc 
2e3fb2
+CC          = mpicc 
2e3fb2
 OPTFLAGS    = -O3
2e3fb2
 CLINKER     = ${CC}
2e3fb2
 LDFLAGS     =
2e3fb2
 CPPFLAGS    = 
2e3fb2
 
2e3fb2
-export MPI_INCLUDE CC LIB_PATH LIBS OPTFLAGS CLINKER LDFLAGS CPPFLAGS
2e3fb2
+export CC OPTFLAGS CLINKER LDFLAGS CPPFLAGS
2e3fb2
 include Makefile.base
2e3fb2
--- mpitests-3.2/Makefile.make	2013-08-27 10:45:52.000000000 -0400
2e3fb2
+++ mpitests-3.2/Makefile	2013-08-27 12:10:36.000000000 -0400
2e3fb2
@@ -1,36 +1,24 @@
2e3fb2
-CFLAGS = 
2e3fb2
-MPIHOME=./
2e3fb2
-CC = 
2e3fb2
-LIBS =  
2e3fb2
-INCLUDES =
2e3fb2
-OBJS = 
2e3fb2
-SRCS = 
2e3fb2
-INSTALL_DIR=tests/
2e3fb2
-INSTALL_IMB=IMB-3.2
2e3fb2
-INSTALL_OSU=osu_benchmarks-3.1.1
2e3fb2
-all: ibm osu
2e3fb2
-install: install-ibm install-osu
2e3fb2
+CC = mpicc
2e3fb2
+IMB=IMB-3.2
2e3fb2
+PRESTA=presta-1.4.0
2e3fb2
+OSU=osu_benchmarks-3.1.1
2e3fb2
+
2e3fb2
+all: imb osu
2e3fb2
+install: install-imb install-osu
2e3fb2
+clean: clean-imb clean-osu
2e3fb2
 
2e3fb2
 # The variable $@ has the value of the target. 
2e3fb2
-ibm: 
2e3fb2
-	cd $(PWD)/$(INSTALL_IMB)/src && make MPIHOME=$(MPIHOME) IMB-MPI1
2e3fb2
+imb: 
2e3fb2
+	cd $(IMB)/src && make all
2e3fb2
 osu: 
2e3fb2
-	cd $(PWD)/$(INSTALL_OSU) && make MPIHOME=$(MPIHOME)
2e3fb2
-clean-ibm: 
2e3fb2
-	cd $(PWD)/$(INSTALL_IMB)/src && make MPIHOME=$(MPIHOME) clean
2e3fb2
+	cd $(OSU) && make all
2e3fb2
+osu-mpi1: 
2e3fb2
+	cd $(OSU) && make mpi1
2e3fb2
+clean-imb: 
2e3fb2
+	cd $(IMB)/src && make clean
2e3fb2
 clean-osu: 
2e3fb2
-	cd $(PWD)/$(INSTALL_OSU) && make MPIHOME=$(MPIHOME) clean
2e3fb2
-clean: clean-ibm clean-osu 
2e3fb2
-	rm -rf $(MPIHOME)/$(INSTALL_DIR)
2e3fb2
-install-ibm:
2e3fb2
-	mkdir -p $(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_IMB)
2e3fb2
-	cp -f $(INSTALL_IMB)/src/IMB-MPI1 $(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_IMB)
2e3fb2
+	cd $(OSU) && make clean
2e3fb2
+install-imb:
2e3fb2
+	cd $(IMB)/src && make install
2e3fb2
 install-osu:
2e3fb2
-	mkdir -p $(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
2e3fb2
-	cp -f $(INSTALL_OSU)/osu_bw		    $(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
2e3fb2
-	cp -f $(INSTALL_OSU)/osu_bibw		$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
2e3fb2
-	cp -f $(INSTALL_OSU)/osu_bcast		$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
2e3fb2
-	cp -f $(INSTALL_OSU)/osu_latency	$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
2e3fb2
-	cp -f $(INSTALL_OSU)/osu_mbw_mr  	$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
2e3fb2
-	cp -f $(INSTALL_OSU)/osu_alltoall  	$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
2e3fb2
-	cp -f $(INSTALL_OSU)/osu_multi_lat	$(MPIHOME)/$(INSTALL_DIR)/$(INSTALL_OSU)
2e3fb2
+	cd $(OSU) && make install