Commit 76f64b5c authored by gropp's avatar gropp
Browse files

Updates for the dllchannel. These fix problems with building in...

Updates for the dllchannel.  These fix problems with building in mpid/common/locks (the configure there needed to use MPICH_INCLUDE_DIRS) and in the builddll scripts (which needed to properly set that value before invoking the configure in mpid/common/locks).  The fix further emphasizes the need to refactor the ch3 code to properly modularize (the locks routines are built several times, with *different* include files.  This should be ok because of how those files are used, but it is not robust).
parent c0807c0b
......@@ -89,7 +89,20 @@ export MPICH2_INCLUDE_FLAGS
if [ ! -d $mybuild/src/mpid/common/locks ] ; then
mkdir $mybuild/src/mpid/common/locks
fi
( CPPFLAGS="$CPPFLAGS -DUSE_PROCESS_LOCKS" ; export CPPFLAGS ; \
# Note that we also need to run the setup in the locks directory
locksSetup=$mympich2/src/mpid/common/locks/setup
if [ ! -f $locksSetup ] ; then
echo "Cannot find $locksSetup , needed to build process locks"
exit 1
fi
( MPICH2_INCLUDE_FLAGS="$MPICH2_INCLUDE_FLAGS -I$mympich2/src/mpid/common/datatype" ; \
MPICH2_INCLUDE_FLAGS="$MPICH2_INCLUDE_FLAGS -I$mympich2/src/mpid/ch3/channels/shm/include" ; \
MPICH2_INCLUDE_FLAGS="$MPICH2_INCLUDE_FLAGS -I../../ch3/channels/shm/include" ; \
MPICH2_INCLUDE_FLAGS="$MPICH2_INCLUDE_FLAGS -I../../ch3/include" ; \
export MPICH2_INCLUDE_FLAGS ; \
CPPFLAGS="$CPPFLAGS -DUSE_PROCESS_LOCKS" ; export CPPFLAGS ; \
. $locksSetup ; \
cd $mybuild/src/mpid/common/locks && \
$mympich2/src/mpid/common/locks/configure --enable-sharedlibs=$shlibtype \
--prefix=$prefix --libdir=$libdir --exec-prefix=$exec_prefix )
......
......@@ -54,4 +54,7 @@ file=${dir}/setup
if test -f $file ; then
echo sourcing $file
. $file
else
echo "Cannot find $file , needed to build process locks"
exit 1
fi
......@@ -106,7 +106,19 @@ fi
if [ ! -d $mybuild/src/mpid/common/locks ] ; then
mkdir $mybuild/src/mpid/common/locks
fi
( CPPFLAGS="$CPPFLAGS -DUSE_PROCESS_LOCKS" ; export CPPFLAGS ; \
# Note that we also need to run the setup in the locks directory
locksSetup=$mympich2/src/mpid/common/locks/setup
if [ ! -f $locksSetup ] ; then
echo "Cannot find $locksSetup , needed to build process locks"
exit 1
fi
( MPICH2_INCLUDE_FLAGS="$MPICH2_INCLUDE_FLAGS -I$mympich2/src/mpid/common/datatype" ; \
MPICH2_INCLUDE_FLAGS="$MPICH2_INCLUDE_FLAGS -I$mympich2/src/mpid/ch3/channels/ssm/include" ; \
MPICH2_INCLUDE_FLAGS="$MPICH2_INCLUDE_FLAGS -I../../ch3/channels/ssm/include" ; \
MPICH2_INCLUDE_FLAGS="$MPICH2_INCLUDE_FLAGS -I../../ch3/include" ; \
export MPICH2_INCLUDE_FLAGS ; \
CPPFLAGS="$CPPFLAGS -DUSE_PROCESS_LOCKS" ; export CPPFLAGS ; \
. $locksSetup ; \
cd $mybuild/src/mpid/common/locks && \
$mympich2/src/mpid/common/locks/configure --enable-sharedlibs=$shlibtype \
--prefix=$prefix --libdir=$libdir --exec-prefix=$exec_prefix )
......
......@@ -45,4 +45,7 @@ file=${dir}/setup
if test -f $file ; then
echo sourcing $file
. $file
else
echo "Cannot find $file , needed to build process locks"
exit 1
fi
......@@ -56,6 +56,9 @@ if test "$HAVE_SPARC_INLINE_PROCESS_LOCKS" = "yes" ; then
dnl AC_MSG_ERROR([Use of inline process locks is not supported. Please volunteer to fix this code])
fi
# Add the MPICH2 include flags to CPPFLAGS.
CPPFLAGS="$CPPFLAGS $MPICH2_INCLUDE_FLAGS"
AC_SUBST(AR)
AC_SUBST(RANLIB)
AC_SUBST(MPILIBNAME)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment