This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 60482cc2ca9a740d049444a9261a04a3007bc306 (commit) via 46d7e443912e210018ccae74bd82543b47fa940a (commit) from b1820e5527045e5ea9c2b11d088615bdbf87dcfa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/60482cc2ca9a740d049444a9261a04a300... commit 60482cc2ca9a740d049444a9261a04a3007bc306 Author: Ken Raffenetti <[email protected]> Date: Mon May 4 00:24:02 2015 -0500 tsuite: explicitly add -lpthread when used in tests For tests that call pthread routines, add an explicit dependency. This was not an issue previously, because either the compile wrappers always added -lpthread, or the linker discovered the pthread symbols via an interlibrary dependency on libmpi. However on FreeBSD 10, the interlibrary dependency resolution appears more strict. Applications must specify any libraries directly used, thus this fix. Signed-off-by: Halim Amer <[email protected]> diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac index 4e9f418..7715ab9 100644 --- a/test/mpi/configure.ac +++ b/test/mpi/configure.ac @@ -695,6 +695,7 @@ if test "$spawndir" = "spawn" ; then AC_SUBST(nslib) fi +threadlib="" # Headers needed for threads tests if test "$threadsdir" = "threads" ; then # Check for needed threads headers and needed and optional routines @@ -703,7 +704,7 @@ if test "$threadsdir" = "threads" ; then # we shouldn't actually need to do this, but we are dodging the chicken/egg # problem b/c we don't have a working mpicc yet and we temporarily discarded # the MPICH-set LIBS (probably the wrong thing to do) - AC_SEARCH_LIBS([pthread_create],[pthread]) + AC_SEARCH_LIBS([pthread_create],[pthread],[threadlib="-lpthread"]) AC_SEARCH_LIBS([pthread_barrier_init],[pthread]) AC_CHECK_FUNCS(pthread_create pthread_yield pthread_barrier_init pthread_barrier_wait) @@ -711,6 +712,7 @@ if test "$threadsdir" = "threads" ; then AC_CHECK_FUNCS(MPI_Init_thread) fi fi +AC_SUBST(threadlib) # Check for h_addr or h_addr_list. This is needed for the singjoin test # in manual/singjoin.c diff --git a/test/mpi/manual/Makefile.am b/test/mpi/manual/Makefile.am index 040a021..94f2687 100644 --- a/test/mpi/manual/Makefile.am +++ b/test/mpi/manual/Makefile.am @@ -16,7 +16,7 @@ noinst_PROGRAMS = singjoin testconnect testconnectserial dimsbalanced \ # directory of the MPI library. This definition is not required. noinst_HEADERS = connectstuff.h testconnectserial_SOURCES = testconnectserial.c tchandlers.c tcutil.c -testconnectserial_LDADD = $(LDADD) -lm +testconnectserial_LDADD = $(LDADD) -lm -lpthread singjoin_LDADD = $(LDADD) @socklib@ @nslib@ diff --git a/test/mpi/threads/Makefile_threads.mtest b/test/mpi/threads/Makefile_threads.mtest index 00675eb..042b91c 100644 --- a/test/mpi/threads/Makefile_threads.mtest +++ b/test/mpi/threads/Makefile_threads.mtest @@ -13,7 +13,7 @@ include $(top_srcdir)/Makefile.mtest ## then add rules/vars for mtestthread.o -LDADD += $(top_builddir)/threads/util/mtestthread.$(OBJEXT) +LDADD += $(top_builddir)/threads/util/mtestthread.$(OBJEXT) @threadlib@ $(top_builddir)/threads/util/mtestthread.$(OBJEXT): $(top_srcdir)/threads/util/mtestthread.c (cd $(top_builddir)/threads/util && $(MAKE) mtestthread.$(OBJEXT)) http://git.mpich.org/mpich.git/commitdiff/46d7e443912e210018ccae74bd82543b47... commit 46d7e443912e210018ccae74bd82543b47fa940a Author: Ken Raffenetti <[email protected]> Date: Sun May 3 22:48:03 2015 -0500 Revert "Patched libtool for inter-library dependency on FreeBSD." This reverts commit 7c0f2967f758e25000bbaba9181726cbf8864357. Signed-off-by: Halim Amer <[email protected]> diff --git a/autogen.sh b/autogen.sh index 5bdf317..5370dbf 100755 --- a/autogen.sh +++ b/autogen.sh @@ -925,12 +925,12 @@ if [ "$do_build_configure" = "yes" ] ; then # Newer versions should have this patch already included. if [ -f $amdir/confdb/libtool.m4 ] ; then # There is no need to patch if we're not going to use Fortran. - libtool_patch_requires_rebuild=no + ifort_patch_requires_rebuild=no if [ $do_bindings = "yes" ] ; then echo_n "Patching libtool.m4 for compatibility with ifort on OSX... " patch -N -s -l $amdir/confdb/libtool.m4 maint/darwin-ifort.patch if [ $? -eq 0 ] ; then - libtool_patch_requires_rebuild=yes + ifort_patch_requires_rebuild=yes # Remove possible leftovers, which don't imply a failure rm -f $amdir/confdb/libtool.m4.orig echo "done" @@ -939,22 +939,7 @@ if [ "$do_build_configure" = "yes" ] ; then fi fi - # Set deplibs_check_method to unknown instead of pass_all on FreeBSD. - # Because the inter-library dependency is broken on the latest - # FreeBSD production release (10.1-RELEASE), but libtool cannot detect - # it correctly. - echo_n "Patching libtool.m4 for compatibility with inter-library dependency on FreeBSD... " - patch -N -s -l $amdir/confdb/libtool.m4 maint/freebsd.patch - if [ $? -eq 0 ] ; then - libtool_patch_requires_rebuild=yes - # Remove possible leftovers, which don't imply a failure - rm -f $amdir/confdb/libtool.m4.orig - echo "done" - else - echo "failed" - fi - - if [ $libtool_patch_requires_rebuild = "yes" ] ; then + if [ $ifort_patch_requires_rebuild = "yes" ] ; then # Rebuild configure (cd $amdir && $autoconf -f) || exit 1 # Reset libtool.m4 timestamps to avoid confusing make diff --git a/maint/freebsd.patch b/maint/freebsd.patch deleted file mode 100644 index 45afb60..0000000 --- a/maint/freebsd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../confdb/libtool.m4~ 2015-04-25 09:07:47.000000000 -0500 -+++ ../confdb/libtool.m4 2015-04-25 09:08:17.000000000 -0500 -@@ -3503,7 +3503,7 @@ - ;; - esac - else -- lt_cv_deplibs_check_method=pass_all -+ lt_cv_deplibs_check_method=unknown - fi - ;; - ----------------------------------------------------------------------- Summary of changes: autogen.sh | 21 +++------------------ maint/freebsd.patch | 11 ----------- test/mpi/configure.ac | 4 +++- test/mpi/manual/Makefile.am | 2 +- test/mpi/threads/Makefile_threads.mtest | 2 +- 5 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 maint/freebsd.patch hooks/post-receive -- MPICH primary repository