Changes to OTF:

- fixed build error when the Python bindings were enabled
	- fixed conflicts with OpenType Fonts:
		- install header files to INCLUDEDIR/otf1
		  (only when building outside VT/Open MPI)
		- install libraries to LIBDIR/otf1
		- renamed otfdump to otfprint

This commit was SVN r27983.

ompi/contrib/vt/vt/config/m4/acinclude.compwrap.m4

@@ -248,6 +248,14 @@ AC_DEFUN([ACVT_COMPWRAP],
 		esac
 	])
 
+	AS_IF([test x"$use_extern_otf" = "xno"],
+	[
+		VT_WRAPPER_CC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_CC_EXTRA_LINKER_FLAGS -L${libdir}/otf1"
+		VT_WRAPPER_CXX_EXTRA_LINKER_FLAGS="$VT_WRAPPER_CXX_EXTRA_LINKER_FLAGS -L${libdir}/otf1"
+		VT_WRAPPER_FC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_FC_EXTRA_LINKER_FLAGS -L${libdir}/otf1"
+		VT_WRAPPER_NVCC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_NVCC_EXTRA_LINKER_FLAGS -L${libdir}/otf1"
+	])
+
 	AS_IF([test "$PLATFORM" = "macos"],
 	[
 		VT_WRAPPER_CC_EXTRA_LINKER_FLAGS="$VT_WRAPPER_CC_EXTRA_LINKER_FLAGS -Wl,-force_flat_namespace"

ompi/contrib/vt/vt/configure.ac

@@ -437,9 +437,6 @@ AM_CONDITIONAL(AMHAVEGPU, test x"$have_cupti_callbacks" = "xyes" -o x"$have_cuda
 # Check path for node-local temporary directory
 ACVT_LTMPDIR
 
-# Setup compiler wrappers
-ACVT_COMPWRAP
-
 # Check for OTF
 ACVT_CONF_TITLE([Open Trace Format (OTF)])
 ACVT_OTF
@@ -464,6 +461,9 @@ AS_IF([test x"$enable_config_titles" = "xyes" -a x"$check_vtrun" = "xno"],
 [AC_MSG_NOTICE([disabled via command line switch])])
 AM_CONDITIONAL(AMBUILDVTRUN, test x"$build_vtrun" = "xyes")
 
+# Setup compiler wrappers
+ACVT_COMPWRAP
+
 # Output files
 AC_CONFIG_FILES([Makefile
 	extlib/Makefile

ompi/contrib/vt/vt/extlib/otf/ChangeLog

@@ -1,4 +1,8 @@
 1.12.2openmpi
+	- fixed conflicts with OpenType Fonts:
+		- install header files to INCLUDEDIR/otf1
+		- install libraries to LIBDIR/otf1
+		- renamed otfdump to otfprint
 	- OTF library:
 		- replaced temporary workaround for handling bogus zlib
 		  sync. points by a more elaborated solution

ompi/contrib/vt/vt/extlib/otf/configure.ac

@@ -25,6 +25,16 @@ AC_ARG_WITH(openmpi-inside, [],
 	])
 ])
 
+# Correct install paths
+AS_IF([test "$inside_openmpi" = "yes" -o "$includedir" = "\${prefix}/include"],
+[includedir="$includedir/otf1"])
+AS_IF([test "$inside_openmpi" = "yes" -o "$libdir" = "\${exec_prefix}/lib" -o "$libdir" = "\${prefix}/lib"],
+[libdir="$libdir/otf1"])
+AS_IF([test "$inside_openmpi" = "yes" -o "$datarootdir" = "\${prefix}/share"],
+[datarootdir="$datarootdir/otf1"])
+AS_IF([test "$docdir" = "\${datarootdir}/doc/\${PACKAGE_TARNAME}"],
+[docdir="\${datarootdir}/doc"])
+
 # Get library version
 OTF_VERSION_LIBRARY=m4_normalize(esyscmd([config/otf_get_version.sh VERSION --library]))
 AC_SUBST([OTF_VERSION_LIBRARY])

ompi/contrib/vt/vt/extlib/otf/otflib_py/Makefile.am

@@ -14,7 +14,7 @@ pkgpython_PYTHON = __init__.py
 nodist_pkgpython_PYTHON = otf.py
 pkgpyexec_LTLIBRARIES = _otf.la
 nodist__otf_la_SOURCES = otf_wrap.c
-_otf_la_CPPFLAGS = $(SWIG_PYTHON_CFLAGS)
+_otf_la_CPPFLAGS = $(AM_CPPFLAGS) $(SWIG_PYTHON_CFLAGS)
 _otf_la_LDFLAGS = -module
 _otf_la_LIBADD = $(top_builddir)/otflib/libotf.la
 _otf_la_DEPENDENCIES = $(_otf_la_LDADD)

ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Makefile.am

@@ -1,13 +1,13 @@
 AM_CPPFLAGS = -I$(top_builddir)/otflib -I$(top_srcdir)/otflib
 
 if AMBUILDBINARIES
-bin_PROGRAMS = \
-	otfdump
+#bin_PROGRAMS = otfdump # until v1.12.2 (conflicts with otfdump from OpenType Fonts)
+bin_PROGRAMS = otfprint
 endif
 
-otfdump_LDADD = $(top_builddir)/otflib/libotf.la
-otfdump_DEPENDENCIES = $(otfdump_LDADD)
-otfdump_SOURCES = \
+otfprint_LDADD = $(top_builddir)/otflib/libotf.la
+otfprint_DEPENDENCIES = $(otfprint_LDADD)
+otfprint_SOURCES = \
 	Makefile.am \
 	Handler.h \
 	Handler.cpp \

ompi/contrib/vt/vt/extlib/otf/tools/otfdump/otfdump.cpp

@@ -26,10 +26,10 @@ using namespace std;
 
 static const char* Helptext[] = {
 "                                                                           \n",
-" otfdump - Convert an OTF trace or parts of it into a human readable, long \n",
-"           version.                                                        \n",
+" otfprint - Convert an OTF trace or parts of it into a human readable, long\n",
+"            version.                                                       \n",
 "                                                                           \n",
-" Syntax: otfdump [options] <input file name>                               \n",
+" Syntax: otfprint [options] <input file name>                              \n",
 "                                                                           \n",
 "   options:                                                                \n",
 "      -h, --help    show this help message                                 \n",
@@ -62,7 +62,7 @@ static const char* Helptext[] = {
 "                    record-type-numbers can be found in OTF_Definitions.h  \n",
 "                    (OTF_*_RECORD)                                         \n",
 "                                                                           \n",
-"      -s, --silent  do not display anything except the time otfdump        \n",
+"      -s, --silent  do not display anything except the time otfprint       \n",
 "                    needed to read the tracefile                           \n",
 "                                                                           \n",
 NULL };

ompi/contrib/vt/vt/extlib/otf/tools/otfdump/otfdump_vs08.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="otfdump"
+	Name="otfprint"
 	ProjectGUID="{508A823C-8EAB-4C56-9DFE-4D85B0D24491}"
-	RootNamespace="otfdump"
+	RootNamespace="otfprint"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>