More fixes for revamped linux paffinity component:
* Enable VPATH builds to work (slight tweak of r14895 -- mainly because I already had it done when George committed :-) ) * Enable "make dist" to work properly for PLPA included mode * Update plpa.h.in * Update svn:ignore Took relevant changes back to the main PLPA SVN as well. This commit was SVN r14896. The following SVN revision numbers were found above: r14895 --> open-mpi/ompi@bb7b04e875
Этот коммит содержится в:
родитель
bb7b04e875
Коммит
a61ed0596a
@ -19,6 +19,9 @@
|
|||||||
|
|
||||||
SUBDIRS = plpa
|
SUBDIRS = plpa
|
||||||
|
|
||||||
|
# To find plpa_bottom.h
|
||||||
|
AM_CPPFLAGS = -I$(top_srcdir)/opal/mca/paffinity/linux/plpa/src/libplpa
|
||||||
|
|
||||||
sources = \
|
sources = \
|
||||||
paffinity_linux.h \
|
paffinity_linux.h \
|
||||||
paffinity_linux_component.c \
|
paffinity_linux_component.c \
|
||||||
@ -28,8 +31,6 @@ sources = \
|
|||||||
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
|
# mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
|
||||||
# (for static builds).
|
# (for static builds).
|
||||||
|
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)/opal/mca/paffinity/linux/plpa/src/libplpa
|
|
||||||
|
|
||||||
if OMPI_BUILD_paffinity_linux_DSO
|
if OMPI_BUILD_paffinity_linux_DSO
|
||||||
component_noinst =
|
component_noinst =
|
||||||
component_install = mca_paffinity_linux.la
|
component_install = mca_paffinity_linux.la
|
||||||
|
@ -15,5 +15,7 @@ SUBDIRS = src
|
|||||||
DIST_SUBDIRS = config $(SUBDIRS)
|
DIST_SUBDIRS = config $(SUBDIRS)
|
||||||
EXTRA_DIST = README VERSION LICENSE AUTHORS
|
EXTRA_DIST = README VERSION LICENSE AUTHORS
|
||||||
|
|
||||||
|
if PLPA_BUILD_STANDALONE
|
||||||
dist-hook:
|
dist-hook:
|
||||||
csh "$(top_srcdir)/config/distscript.csh" "$(top_srcdir)" "$(distdir)" "$(PLPA_VERSION)" "$(PLPA_SVN_R)"
|
csh "$(top_srcdir)/config/distscript.csh" "$(top_srcdir)" "$(distdir)" "$(PLPA_VERSION)" "$(PLPA_SVN_R)"
|
||||||
|
endif
|
||||||
|
@ -264,9 +264,10 @@ AC_DEFUN([_PLPA_INIT],[
|
|||||||
# If we're building executables, we need some things for plpa-taskset
|
# If we're building executables, we need some things for plpa-taskset
|
||||||
if test "$plpa_executables" = "yes"; then
|
if test "$plpa_executables" = "yes"; then
|
||||||
AC_C_INLINE
|
AC_C_INLINE
|
||||||
|
fi
|
||||||
|
# Always need these for make dist (both included and standalone)
|
||||||
AM_PROG_LEX
|
AM_PROG_LEX
|
||||||
AC_PROG_YACC
|
AC_PROG_YACC
|
||||||
fi
|
|
||||||
|
|
||||||
# Success
|
# Success
|
||||||
$1
|
$1
|
||||||
|
@ -48,6 +48,10 @@
|
|||||||
/* Define to 1 if you have the <unistd.h> header file. */
|
/* Define to 1 if you have the <unistd.h> header file. */
|
||||||
#undef HAVE_UNISTD_H
|
#undef HAVE_UNISTD_H
|
||||||
|
|
||||||
|
/* Define to the sub-directory in which libtool stores uninstalled libraries.
|
||||||
|
*/
|
||||||
|
#undef LT_OBJDIR
|
||||||
|
|
||||||
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
|
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
|
||||||
#undef NO_MINUS_C_MINUS_O
|
#undef NO_MINUS_C_MINUS_O
|
||||||
|
|
||||||
@ -91,6 +95,12 @@
|
|||||||
`char[]'. */
|
`char[]'. */
|
||||||
#undef YYTEXT_POINTER
|
#undef YYTEXT_POINTER
|
||||||
|
|
||||||
|
/* Emulated value */
|
||||||
|
#undef __NR_sched_getaffinity
|
||||||
|
|
||||||
|
/* Emulated value */
|
||||||
|
#undef __NR_sched_setaffinity
|
||||||
|
|
||||||
/* Define to `__inline__' or `__inline' if that's what the C compiler
|
/* Define to `__inline__' or `__inline' if that's what the C compiler
|
||||||
calls it, or to nothing if 'inline' is not supported under any name. */
|
calls it, or to nothing if 'inline' is not supported under any name. */
|
||||||
#ifndef __cplusplus
|
#ifndef __cplusplus
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user