1 --- mpich-1.2.1/mpid/ch_p4/Makefile.in.orig Wed Aug 16 21:22:39 2000
2 +++ mpich-1.2.1/mpid/ch_p4/Makefile.in Tue May 29 22:11:11 2001
4 # found in, not the directory where the compiler is running (!)
5 # Trailing / causes problems for some versions of gcc (was -I./)
6 # Was -I../.. -I../ch_p4
7 -CFLAGS = @CFLAGS@ -I${top_srcdir}/mpid/ch2 -I${srcdir} -I${top_srcdir}/mpid/util -Ip4 -Ip4/include
8 +CFLAGS = @CFLAGS@ ${OPTFLAGS} -I${top_srcdir}/mpid/ch2 -I${srcdir} -I${top_srcdir}/mpid/util -Ip4 -Ip4/include
10 # See mpid/ch_adi2/Makefile.in for a full list
11 SOURCE = adi2recv.c adi2send.c adi2init.c adi2probe.c adi2ssend.c \
12 --- mpich-1.2.5/src/env/Makefile.in.orig Tue Sep 5 16:23:17 2000
13 +++ mpich-1.2.5/src/env/Makefile.in Tue May 29 22:28:29 2001
15 # the MPI libraries will work
16 msgqdllloc.o: ${top_srcdir}/src/env/msgqdllloc.c
17 @if test -n "@SHAREDKIND_FOR_TV@" -a "@SHAREDKIND_FOR_TV@" != "ignore" ; then \
18 - ${CC} ${DEFS} ${CFLAGS} -c @CC_SHARED_OPT_FOR_TV@ \
19 + ${CC} ${DEFS} ${CFLAGS} ${OPTFLAGSC} ${OPTFLAGS} -c @CC_SHARED_OPT_FOR_TV@ \
20 -DMPICH_INFODLL_LOC='"@libdir@/libtvmpich.so"' ${top_srcdir}/src/env/msgqdllloc.c ; \
22 - ${CC} ${DEFS} ${CFLAGS} -c ${top_srcdir}/src/env/msgqdllloc.c ; \
23 + ${CC} ${DEFS} ${CFLAGS} ${OPTFLAGSC} ${OPTFLAGS} -c ${top_srcdir}/src/env/msgqdllloc.c ; \
27 --- mpich-1.2.5/src/infoexport/Makefile.in.orig Fri Jan 14 21:58:04 2000
28 +++ mpich-1.2.5/src/infoexport/Makefile.in Tue May 29 22:50:47 2001
31 # Define FOR_MPI2=1 to enable some MPI-2 support
32 DEFS = @DEFS@ ${MPIPROFILE} -I. -I${srcdir} @mpich_includes@ -DFOR_MPI2=0
33 -CFLAGS = -g @CC_SHARED_OPT_FOR_TV@ @CFLAGS@
34 +CFLAGS = @OPTFLAGS@ @CC_SHARED_OPT_FOR_TV@ @CFLAGS@
38 --- mpich-1.2.1/src/fortran/configure.in.orig Tue Aug 29 23:53:00 2000
39 +++ mpich-1.2.1/src/fortran/configure.in Tue May 29 22:56:52 2001
43 [--enable-strict - Turn on strict compilation testing when using gcc],
44 -COPTIONS="${COPTIONS} -Wall -O -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL")
45 +COPTIONS="${COPTIONS} -Wall -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL")
48 [--enable-echo - Turn on echoing from within the configure script],
49 --- mpich-1.2.1/src/fortran/configure.orig Tue Sep 5 22:05:39 2000
50 +++ mpich-1.2.1/src/fortran/configure Tue May 29 23:16:32 2001
52 # Check whether --enable-strict or --disable-strict was given.
53 if test "${enable_strict+set}" = set; then
54 enableval="$enable_strict"
55 - COPTIONS="${COPTIONS} -Wall -O -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL"
56 + COPTIONS="${COPTIONS} -Wall -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL"
60 --- mpich-1.2.5.3/configure.in.orig 2004-04-05 15:48:47.000000000 +0200
61 +++ mpich-1.2.5.3/configure.in 2004-07-04 13:39:28.170198120 +0200
66 + COPTIONS="$OPTFLAGSC $OPTFLAGS"; export COPTIONS;\
67 + FOPTIONS="$OPTFLAGSF $OPTFLAGS"; export FOPTIONS;\
68 export mpich_includes ;\
70 export BASE_LIB_LIST ;\
73 export int_len ; export void_star_len ; export OFFSET_KIND ; \
74 export long_long_len ; \
75 + CFLAGS="$OPTFLAGSC $OPTFLAGS" ; export CFLAGS ; \
76 "${top_srcdir}/romio/configure" $ROMIO_ARGS $ROMIO_FILE_SYSTEM \
77 --with-mpi=mpich $romio_config_args $enable_args $with_args )
80 --prefix=${prefix} $enable_args $with_args \
81 --libdir=${libdir} --bindir=${bindir} \
82 --includedir=${includedir} \
83 + --with-cflags="$OPTFLAGSC $OPTFLAGS" \
86 echo "Done configuring MPE Profiling Libraries" ; echo
87 --- mpich-1.2.5.3/configure.orig 2004-04-07 19:26:01.000000000 +0200
88 +++ mpich-1.2.5.3/configure 2004-07-04 13:40:20.934176776 +0200
89 @@ -15634,6 +15634,8 @@
93 + COPTIONS="$OPTFLAGSC $OPTFLAGS"; export COPTIONS;\
94 + FOPTIONS="$OPTFLAGSF $OPTFLAGS"; export FOPTIONS;\
95 export mpich_includes ;\
97 export BASE_LIB_LIST ;\
98 @@ -15900,6 +15902,7 @@
100 export int_len ; export void_star_len ; export OFFSET_KIND ; \
101 export long_long_len ; \
102 + CFLAGS="$OPTFLAGSC $OPTFLAGS" ; export CFLAGS ; \
103 "${top_srcdir}/romio/configure" $ROMIO_ARGS $ROMIO_FILE_SYSTEM \
104 --with-mpi=mpich $romio_config_args $enable_args $with_args )
106 @@ -15994,6 +15997,7 @@
107 --prefix=${prefix} $enable_args $with_args \
108 --libdir=${libdir} --bindir=${bindir} \
109 --includedir=${includedir} \
110 + --with-cflags="$OPTFLAGSC $OPTFLAGS" \
112 if test $? = 0 ; then
113 echo "Done configuring MPE Profiling Libraries" ; echo
114 --- mpich-1.2.5.3/Makefile.in.orig Tue Sep 5 22:06:05 2000
115 +++ mpich-1.2.5.3/Makefile.in Wed May 30 01:07:43 2001
117 CC="@CC@" ; export CC ; \
118 ldir=`echo $(libdir) | sed -e 's%$(MPIR_HOME)/%%g'` ; \
119 if ${top_srcdir}/${CPP_DIR}/configure --with-mpich=.. \
120 - --with-libopt=" " \
121 + --with-libopt="@OPTFLAGS@" \
123 --with-mpichbin=${binbuild_dir} \
124 --with-mpichlib=${libbuild_dir} \
127 @if [ ! -d mpid/server ] ; then mkdir mpid/server ; fi
128 @( cd mpid/server && rm -f config.cache ; \
129 + CFLAGS="@OPTFLAGSC@ @OPTFLAGS@"; export CFLAGS ; \
130 CC="@CC@" ; export CC ; MAKE="${MAKE}" ; export MAKE ; \
131 ${top_srcdir}/mpid/server/configure ; $(MAKE) serv_p4 ; \
132 cp serv_p4 $(binbuild_dir) )
133 --- mpich-1.2.5/mpid/ch_p4/setup_ch_p4.orig Fri Aug 18 21:45:14 2000
134 +++ mpich-1.2.5/mpid/ch_p4/setup_ch_p4 Wed May 30 05:11:02 2001
136 echo "Configuring new p4 secure server"
138 CC="$CC" ; export CC ; \
139 + CFLAGS="$OPTFLAGS"; export CFLAGS ; \
140 "$top_srcdir/mpid/server/configure" )
141 if test $? != 0 ; then
142 print_error "Configure of the secure server may have failed!"