From 1e0c8868140042555a5060eef6c9a09586e219f4 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 20 Jul 2017 15:12:39 -0700 Subject: [PATCH 1/2] Revert "Remove build product and update .gitignore to avoid picking it up again" This isn't correct as this file is build product. However, it isn't getting correctly generated and so we cannot build the master without it for now. Will find root cause and re-fix This reverts commit 7d8d877837de3987dffb9c9a3bea4224c4480f61. Signed-off-by: Ralph Castain --- .gitignore | 6 +- .../hwloc/include/private/autogen/config.h.in | 728 ++++++++++++++++++ 2 files changed, 730 insertions(+), 4 deletions(-) create mode 100644 opal/mca/hwloc/hwloc2x/hwloc/include/private/autogen/config.h.in diff --git a/.gitignore b/.gitignore index 9b462dbe3b5..8138cd8055f 100644 --- a/.gitignore +++ b/.gitignore @@ -302,11 +302,7 @@ opal/mca/event/libevent*/libevent/libevent_pthreads.pc opal/mca/event/libevent*/libevent/include/event2/event-config.h opal/mca/hwloc/hwloc*/hwloc/include/hwloc/autogen/config.h -opal/mca/hwloc/hwloc*/hwloc/include/hwloc/autogen/config.h.in opal/mca/hwloc/hwloc*/hwloc/include/private/autogen/config.h -opal/mca/hwloc/hwloc*/hwloc/include/private/autogen/config.h.in -opal/mca/hwloc/base/static-components.h.new.extern -opal/mca/hwloc/base/static-components.h.new.struct opal/mca/installdirs/config/install_dirs.h @@ -314,6 +310,8 @@ opal/mca/pmix/pmix*/pmix/include/pmix/autogen/config.h opal/mca/pmix/pmix*/pmix/include/pmix/autogen/config.h.in opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h.in opal/mca/pmix/pmix*/pmix/src/include/private/autogen/config.h +opal/mca/hwloc/base/static-components.h.new.extern +opal/mca/hwloc/base/static-components.h.new.struct opal/mca/pmix/pmix2x/pmix/src/include/frameworks.h opal/mca/pmix/pmix2x/pmix/src/mca/pinstalldirs/config/pinstall_dirs.h opal/mca/pmix/pmix2x/pmix/config/autogen_found_items.m4 diff --git a/opal/mca/hwloc/hwloc2x/hwloc/include/private/autogen/config.h.in b/opal/mca/hwloc/hwloc2x/hwloc/include/private/autogen/config.h.in new file mode 100644 index 00000000000..f65a8be4736 --- /dev/null +++ b/opal/mca/hwloc/hwloc2x/hwloc/include/private/autogen/config.h.in @@ -0,0 +1,728 @@ +/* include/private/autogen/config.h.in. Generated from configure.ac by autoheader. */ + +/* -*- c -*- + * + * Copyright © 2009, 2011, 2012 CNRS, inria., Université Bordeaux All rights reserved. + * Copyright © 2009-2014 Cisco Systems, Inc. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + * + * This file is automatically generated by configure. Edits will be lost + * the next time you run configure! + */ + +#ifndef HWLOC_CONFIGURE_H +#define HWLOC_CONFIGURE_H + + +/* Define to 1 if the system has the type `CACHE_DESCRIPTOR'. */ +#undef HAVE_CACHE_DESCRIPTOR + +/* Define to 1 if the system has the type `CACHE_RELATIONSHIP'. */ +#undef HAVE_CACHE_RELATIONSHIP + +/* Define to 1 if you have the `clock_gettime' function. */ +#undef HAVE_CLOCK_GETTIME + +/* Define to 1 if you have the `clz' function. */ +#undef HAVE_CLZ + +/* Define to 1 if you have the `clzl' function. */ +#undef HAVE_CLZL + +/* Define to 1 if you have the header file. */ +#undef HAVE_CL_CL_EXT_H + +/* Define to 1 if you have the `cpuset_setaffinity' function. */ +#undef HAVE_CPUSET_SETAFFINITY + +/* Define to 1 if you have the `cpuset_setid' function. */ +#undef HAVE_CPUSET_SETID + +/* Define to 1 if you have the header file. */ +#undef HAVE_CTYPE_H + +/* Define to 1 if we have -lcuda */ +#undef HAVE_CUDA + +/* Define to 1 if you have the header file. */ +#undef HAVE_CUDA_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_CUDA_RUNTIME_API_H + +/* Define to 1 if you have the declaration of `CL_DEVICE_TOPOLOGY_AMD', and to + 0 if you don't. */ +#undef HAVE_DECL_CL_DEVICE_TOPOLOGY_AMD + +/* Define to 1 if you have the declaration of `CTL_HW', and to 0 if you don't. + */ +#undef HAVE_DECL_CTL_HW + +/* Define to 1 if you have the declaration of `fabsf', and to 0 if you don't. + */ +#undef HAVE_DECL_FABSF + +/* Define to 1 if you have the declaration of `getexecname', and to 0 if you + don't. */ +#undef HAVE_DECL_GETEXECNAME + +/* Define to 1 if you have the declaration of `GetModuleFileName', and to 0 if + you don't. */ +#undef HAVE_DECL_GETMODULEFILENAME + +/* Define to 1 if you have the declaration of `getprogname', and to 0 if you + don't. */ +#undef HAVE_DECL_GETPROGNAME + +/* Define to 1 if you have the declaration of `HW_NCPU', and to 0 if you + don't. */ +#undef HAVE_DECL_HW_NCPU + +/* Define to 1 if you have the declaration of `lgrp_latency_cookie', and to 0 + if you don't. */ +#undef HAVE_DECL_LGRP_LATENCY_COOKIE + +/* Define to 1 if you have the declaration of + `nvmlDeviceGetMaxPcieLinkGeneration', and to 0 if you don't. */ +#undef HAVE_DECL_NVMLDEVICEGETMAXPCIELINKGENERATION + +/* Define to 1 if you have the declaration of `pthread_getaffinity_np', and to + 0 if you don't. */ +#undef HAVE_DECL_PTHREAD_GETAFFINITY_NP + +/* Define to 1 if you have the declaration of `pthread_setaffinity_np', and to + 0 if you don't. */ +#undef HAVE_DECL_PTHREAD_SETAFFINITY_NP + +/* Embedded mode; just assume we do not have Valgrind support */ +#undef HAVE_DECL_RUNNING_ON_VALGRIND + +/* Define to 1 if you have the declaration of `snprintf', and to 0 if you + don't. */ +#undef HAVE_DECL_SNPRINTF + +/* Define to 1 if you have the declaration of `strcasecmp', and to 0 if you + don't. */ +#undef HAVE_DECL_STRCASECMP + +/* Define to 1 if you have the declaration of `strtoull', and to 0 if you + don't. */ +#undef HAVE_DECL_STRTOULL + +/* Define to 1 if you have the declaration of `_putenv', and to 0 if you + don't. */ +#undef HAVE_DECL__PUTENV + +/* Define to 1 if you have the declaration of `_SC_LARGE_PAGESIZE', and to 0 + if you don't. */ +#undef HAVE_DECL__SC_LARGE_PAGESIZE + +/* Define to 1 if you have the declaration of `_SC_NPROCESSORS_CONF', and to 0 + if you don't. */ +#undef HAVE_DECL__SC_NPROCESSORS_CONF + +/* Define to 1 if you have the declaration of `_SC_NPROCESSORS_ONLN', and to 0 + if you don't. */ +#undef HAVE_DECL__SC_NPROCESSORS_ONLN + +/* Define to 1 if you have the declaration of `_SC_NPROC_CONF', and to 0 if + you don't. */ +#undef HAVE_DECL__SC_NPROC_CONF + +/* Define to 1 if you have the declaration of `_SC_NPROC_ONLN', and to 0 if + you don't. */ +#undef HAVE_DECL__SC_NPROC_ONLN + +/* Define to 1 if you have the declaration of `_SC_PAGESIZE', and to 0 if you + don't. */ +#undef HAVE_DECL__SC_PAGESIZE + +/* Define to 1 if you have the declaration of `_SC_PAGE_SIZE', and to 0 if you + don't. */ +#undef HAVE_DECL__SC_PAGE_SIZE + +/* Define to 1 if you have the declaration of `_strdup', and to 0 if you + don't. */ +#undef HAVE_DECL__STRDUP + +/* Define to 1 if you have the header file. */ +#undef HAVE_DIRENT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the `ffs' function. */ +#undef HAVE_FFS + +/* Define to 1 if you have the `ffsl' function. */ +#undef HAVE_FFSL + +/* Define to 1 if you have the `fls' function. */ +#undef HAVE_FLS + +/* Define to 1 if you have the `flsl' function. */ +#undef HAVE_FLSL + +/* Define to 1 if you have the `getpagesize' function. */ +#undef HAVE_GETPAGESIZE + +/* Define to 1 if the system has the type `GROUP_AFFINITY'. */ +#undef HAVE_GROUP_AFFINITY + +/* Define to 1 if the system has the type `GROUP_RELATIONSHIP'. */ +#undef HAVE_GROUP_RELATIONSHIP + +/* Define to 1 if you have the `host_info' function. */ +#undef HAVE_HOST_INFO + +/* Define to 1 if you have the header file. */ +#undef HAVE_INFINIBAND_VERBS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if the system has the type `KAFFINITY'. */ +#undef HAVE_KAFFINITY + +/* Define to 1 if you have the header file. */ +#undef HAVE_KSTAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LANGINFO_H + +/* Define to 1 if we have -lgdi32 */ +#undef HAVE_LIBGDI32 + +/* Define to 1 if we have -libverbs */ +#undef HAVE_LIBIBVERBS + +/* Define to 1 if we have -lkstat */ +#undef HAVE_LIBKSTAT + +/* Define to 1 if we have -llgrp */ +#undef HAVE_LIBLGRP + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBUDEV_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOCALE_H + +/* Define to 1 if the system has the type `LOGICAL_PROCESSOR_RELATIONSHIP'. */ +#undef HAVE_LOGICAL_PROCESSOR_RELATIONSHIP + +/* Define to 1 if you have the header file. */ +#undef HAVE_MACH_MACH_HOST_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MACH_MACH_INIT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MALLOC_H + +/* Define to 1 if you have the `memalign' function. */ +#undef HAVE_MEMALIGN + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MPI_H + +/* Define to 1 if we have -lmyriexpress */ +#undef HAVE_MYRIEXPRESS + +/* Define to 1 if you have the header file. */ +#undef HAVE_MYRIEXPRESS_H + +/* Define to 1 if you have the `nl_langinfo' function. */ +#undef HAVE_NL_LANGINFO + +/* Define to 1 if the system has the type `NUMA_NODE_RELATIONSHIP'. */ +#undef HAVE_NUMA_NODE_RELATIONSHIP + +/* Define to 1 if you have the header file. */ +#undef HAVE_NVCTRL_NVCTRL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NVML_H + +/* Define to 1 if you have the `openat' function. */ +#undef HAVE_OPENAT + +/* Define to 1 if you have the header file. */ +#undef HAVE_PICL_H + +/* Define to 1 if you have the `posix_memalign' function. */ +#undef HAVE_POSIX_MEMALIGN + +/* Define to 1 if the system has the type `PROCESSOR_CACHE_TYPE'. */ +#undef HAVE_PROCESSOR_CACHE_TYPE + +/* Define to 1 if the system has the type `PROCESSOR_GROUP_INFO'. */ +#undef HAVE_PROCESSOR_GROUP_INFO + +/* Define to 1 if the system has the type `PROCESSOR_NUMBER'. */ +#undef HAVE_PROCESSOR_NUMBER + +/* Define to 1 if the system has the type `PROCESSOR_RELATIONSHIP'. */ +#undef HAVE_PROCESSOR_RELATIONSHIP + +/* Define to '1' if program_invocation_name is present and usable */ +#undef HAVE_PROGRAM_INVOCATION_NAME + +/* Define to 1 if the system has the type `PSAPI_WORKING_SET_EX_BLOCK'. */ +#undef HAVE_PSAPI_WORKING_SET_EX_BLOCK + +/* Define to 1 if the system has the type `PSAPI_WORKING_SET_EX_INFORMATION'. + */ +#undef HAVE_PSAPI_WORKING_SET_EX_INFORMATION + +/* Define to 1 if you have the header file. */ +#undef HAVE_PTHREAD_NP_H + +/* Define to 1 if the system has the type `pthread_t'. */ +#undef HAVE_PTHREAD_T + +/* Define to 1 if you have the `putwc' function. */ +#undef HAVE_PUTWC + +/* Define to 1 if the system has the type `RelationProcessorPackage'. */ +#undef HAVE_RELATIONPROCESSORPACKAGE + +/* Define to 1 if you have the `setlocale' function. */ +#undef HAVE_SETLOCALE + +/* Define to 1 if the system has the type `ssize_t'. */ +#undef HAVE_SSIZE_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strftime' function. */ +#undef HAVE_STRFTIME + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strncasecmp' function. */ +#undef HAVE_STRNCASECMP + +/* Define to 1 if you have the `strtoull' function. */ +#undef HAVE_STRTOULL + +/* Define to '1' if sysctl is present and usable */ +#undef HAVE_SYSCTL + +/* Define to '1' if sysctlbyname is present and usable */ +#undef HAVE_SYSCTLBYNAME + +/* Define to 1 if the system has the type + `SYSTEM_LOGICAL_PROCESSOR_INFORMATION'. */ +#undef HAVE_SYSTEM_LOGICAL_PROCESSOR_INFORMATION + +/* Define to 1 if the system has the type + `SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX'. */ +#undef HAVE_SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_CPUSET_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_LGRP_USER_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_MMAN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSCTL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_UTSNAME_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_TIME_H + +/* Define to 1 if you have the `uname' function. */ +#undef HAVE_UNAME + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the `uselocale' function. */ +#undef HAVE_USELOCALE + +/* Define to 1 if you have the header file. */ +#undef HAVE_VALGRIND_VALGRIND_H + +/* Define to 1 if the system has the type `wchar_t'. */ +#undef HAVE_WCHAR_T + +/* Define to 1 if you have the header file. */ +#undef HAVE_X11_KEYSYM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_X11_XLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_X11_XUTIL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_XLOCALE_H + +/* Define to '1' if __progname is present and usable */ +#undef HAVE___PROGNAME + +/* Define to 1 on AIX */ +#undef HWLOC_AIX_SYS + +/* Define to 1 on BlueGene/Q */ +#undef HWLOC_BGQ_SYS + +/* Whether C compiler supports symbol visibility or not */ +#undef HWLOC_C_HAVE_VISIBILITY + +/* Define to 1 on Darwin */ +#undef HWLOC_DARWIN_SYS + +/* Whether we are in debugging mode or not */ +#undef HWLOC_DEBUG + +/* Define to 1 on *FREEBSD */ +#undef HWLOC_FREEBSD_SYS + +/* Whether your compiler has __attribute__ or not */ +#undef HWLOC_HAVE_ATTRIBUTE + +/* Whether your compiler has __attribute__ aligned or not */ +#undef HWLOC_HAVE_ATTRIBUTE_ALIGNED + +/* Whether your compiler has __attribute__ always_inline or not */ +#undef HWLOC_HAVE_ATTRIBUTE_ALWAYS_INLINE + +/* Whether your compiler has __attribute__ cold or not */ +#undef HWLOC_HAVE_ATTRIBUTE_COLD + +/* Whether your compiler has __attribute__ const or not */ +#undef HWLOC_HAVE_ATTRIBUTE_CONST + +/* Whether your compiler has __attribute__ deprecated or not */ +#undef HWLOC_HAVE_ATTRIBUTE_DEPRECATED + +/* Whether your compiler has __attribute__ format or not */ +#undef HWLOC_HAVE_ATTRIBUTE_FORMAT + +/* Whether your compiler has __attribute__ hot or not */ +#undef HWLOC_HAVE_ATTRIBUTE_HOT + +/* Whether your compiler has __attribute__ malloc or not */ +#undef HWLOC_HAVE_ATTRIBUTE_MALLOC + +/* Whether your compiler has __attribute__ may_alias or not */ +#undef HWLOC_HAVE_ATTRIBUTE_MAY_ALIAS + +/* Whether your compiler has __attribute__ nonnull or not */ +#undef HWLOC_HAVE_ATTRIBUTE_NONNULL + +/* Whether your compiler has __attribute__ noreturn or not */ +#undef HWLOC_HAVE_ATTRIBUTE_NORETURN + +/* Whether your compiler has __attribute__ no_instrument_function or not */ +#undef HWLOC_HAVE_ATTRIBUTE_NO_INSTRUMENT_FUNCTION + +/* Whether your compiler has __attribute__ packed or not */ +#undef HWLOC_HAVE_ATTRIBUTE_PACKED + +/* Whether your compiler has __attribute__ pure or not */ +#undef HWLOC_HAVE_ATTRIBUTE_PURE + +/* Whether your compiler has __attribute__ sentinel or not */ +#undef HWLOC_HAVE_ATTRIBUTE_SENTINEL + +/* Whether your compiler has __attribute__ unused or not */ +#undef HWLOC_HAVE_ATTRIBUTE_UNUSED + +/* Whether your compiler has __attribute__ warn unused result or not */ +#undef HWLOC_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT + +/* Whether your compiler has __attribute__ weak alias or not */ +#undef HWLOC_HAVE_ATTRIBUTE_WEAK_ALIAS + +/* Define to 1 if your `ffs' function is known to be broken. */ +#undef HWLOC_HAVE_BROKEN_FFS + +/* Define to 1 if you have the `cairo' library. */ +#undef HWLOC_HAVE_CAIRO + +/* Define to 1 if you have the `clz' function. */ +#undef HWLOC_HAVE_CLZ + +/* Define to 1 if you have the `clzl' function. */ +#undef HWLOC_HAVE_CLZL + +/* Define to 1 if the CPU_SET macro works */ +#undef HWLOC_HAVE_CPU_SET + +/* Define to 1 if the CPU_SET_S macro works */ +#undef HWLOC_HAVE_CPU_SET_S + +/* Define to 1 if you have the `cudart' SDK. */ +#undef HWLOC_HAVE_CUDART + +/* Define to 1 if function `clz' is declared by system headers */ +#undef HWLOC_HAVE_DECL_CLZ + +/* Define to 1 if function `clzl' is declared by system headers */ +#undef HWLOC_HAVE_DECL_CLZL + +/* Define to 1 if function `ffs' is declared by system headers */ +#undef HWLOC_HAVE_DECL_FFS + +/* Define to 1 if function `ffsl' is declared by system headers */ +#undef HWLOC_HAVE_DECL_FFSL + +/* Define to 1 if function `fls' is declared by system headers */ +#undef HWLOC_HAVE_DECL_FLS + +/* Define to 1 if function `flsl' is declared by system headers */ +#undef HWLOC_HAVE_DECL_FLSL + +/* Define to 1 if function `strncasecmp' is declared by system headers */ +#undef HWLOC_HAVE_DECL_STRNCASECMP + +/* Define to 1 if you have the `ffs' function. */ +#undef HWLOC_HAVE_FFS + +/* Define to 1 if you have the `ffsl' function. */ +#undef HWLOC_HAVE_FFSL + +/* Define to 1 if you have the `fls' function. */ +#undef HWLOC_HAVE_FLS + +/* Define to 1 if you have the `flsl' function. */ +#undef HWLOC_HAVE_FLSL + +/* Define to 1 if you have the GL module components. */ +#undef HWLOC_HAVE_GL + +/* Define to 1 if you have a library providing the termcap interface */ +#undef HWLOC_HAVE_LIBTERMCAP + +/* Define to 1 if you have libudev. */ +#undef HWLOC_HAVE_LIBUDEV + +/* Define to 1 if you have the `libxml2' library. */ +#undef HWLOC_HAVE_LIBXML2 + +/* Define to 1 if building the Linux I/O component */ +#undef HWLOC_HAVE_LINUXIO + +/* Define to 1 if enabling Linux-specific PCI discovery in the Linux I/O + component */ +#undef HWLOC_HAVE_LINUXPCI + +/* Define to 1 if you have the `NVML' library. */ +#undef HWLOC_HAVE_NVML + +/* Define to 1 if glibc provides the old prototype (without length) of + sched_setaffinity() */ +#undef HWLOC_HAVE_OLD_SCHED_SETAFFINITY + +/* Define to 1 if you have the `OpenCL' library. */ +#undef HWLOC_HAVE_OPENCL + +/* Define to 1 if the hwloc library should support dynamically-loaded plugins + */ +#undef HWLOC_HAVE_PLUGINS + +/* `Define to 1 if you have pthread_getthrds_np' */ +#undef HWLOC_HAVE_PTHREAD_GETTHRDS_NP + +/* Define to 1 if pthread mutexes are available */ +#undef HWLOC_HAVE_PTHREAD_MUTEX + +/* Define to 1 if glibc provides a prototype of sched_setaffinity() */ +#undef HWLOC_HAVE_SCHED_SETAFFINITY + +/* Define to 1 if you have the header file. */ +#undef HWLOC_HAVE_STDINT_H + +/* Define to 1 if function `syscall' is available with 6 parameters */ +#undef HWLOC_HAVE_SYSCALL + +/* Define to 1 if you have the `windows.h' header. */ +#undef HWLOC_HAVE_WINDOWS_H + +/* Define to 1 if X11 headers including Xutil.h and keysym.h are available. */ +#undef HWLOC_HAVE_X11_KEYSYM + +/* Define to 1 if you have x86 cpuid */ +#undef HWLOC_HAVE_X86_CPUID + +/* Define to 1 on HP-UX */ +#undef HWLOC_HPUX_SYS + +/* Define to 1 on Irix */ +#undef HWLOC_IRIX_SYS + +/* Define to 1 on Linux */ +#undef HWLOC_LINUX_SYS + +/* Define to 1 on *NETBSD */ +#undef HWLOC_NETBSD_SYS + +/* The size of `unsigned int', as computed by sizeof */ +#undef HWLOC_SIZEOF_UNSIGNED_INT + +/* The size of `unsigned long', as computed by sizeof */ +#undef HWLOC_SIZEOF_UNSIGNED_LONG + +/* Define to 1 on Solaris */ +#undef HWLOC_SOLARIS_SYS + +/* The hwloc symbol prefix */ +#undef HWLOC_SYM_PREFIX + +/* The hwloc symbol prefix in all caps */ +#undef HWLOC_SYM_PREFIX_CAPS + +/* Whether we need to re-define all the hwloc public symbols or not */ +#undef HWLOC_SYM_TRANSFORM + +/* Define to 1 on unsupported systems */ +#undef HWLOC_UNSUPPORTED_SYS + +/* Define to 1 if ncurses works, preferred over curses */ +#undef HWLOC_USE_NCURSES + +/* The library version, always available, even in embedded mode, contrary to + VERSION */ +#undef HWLOC_VERSION + +/* Define to 1 on WINDOWS */ +#undef HWLOC_WIN_SYS + +/* Define to 1 on x86_32 */ +#undef HWLOC_X86_32_ARCH + +/* Define to 1 on x86_64 */ +#undef HWLOC_X86_64_ARCH + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + +/* Define to 1 if scotch is netlocscotch is enabled */ +#undef NETLOC_SCOTCH + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* The size of `unsigned int', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_INT + +/* The size of `unsigned long', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_LONG + +/* The size of `void *', as computed by sizeof. */ +#undef SIZEOF_VOID_P + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Enable extensions on HP-UX. */ +#ifndef _HPUX_SOURCE +# undef _HPUX_SOURCE +#endif + + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + +/* Version number of package */ +#undef VERSION + +/* Define to 1 if the X Window System is missing or not being used. */ +#undef X_DISPLAY_MISSING + +/* Are we building for HP-UX? */ +#undef _HPUX_SOURCE + +/* Define to 1 if on MINIX. */ +#undef _MINIX + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#undef _POSIX_SOURCE + +/* Define this to the process ID type */ +#undef hwloc_pid_t + +/* Define this to the thread ID type */ +#undef hwloc_thread_t + + +#endif /* HWLOC_CONFIGURE_H */ + From 512c61b3d175124a2f45583434ab2e99c5a8050b Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 20 Jul 2017 15:25:22 -0700 Subject: [PATCH 2/2] Don't run autogen.sh inside hwloc2x installation as it comes from a tarball Signed-off-by: Ralph Castain --- opal/mca/hwloc/hwloc2x/Makefile.am | 4 +--- opal/mca/hwloc/hwloc2x/autogen.subdirs | 1 - .../hwloc2x/hwloc/include/private/autogen/config.h.in | 7 +------ 3 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 opal/mca/hwloc/hwloc2x/autogen.subdirs diff --git a/opal/mca/hwloc/hwloc2x/Makefile.am b/opal/mca/hwloc/hwloc2x/Makefile.am index 7a9a9da0b59..f41bcd1e2fc 100644 --- a/opal/mca/hwloc/hwloc2x/Makefile.am +++ b/opal/mca/hwloc/hwloc2x/Makefile.am @@ -1,6 +1,6 @@ # # Copyright (c) 2011-2016 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2014-2015 Intel, Inc. All right reserved. +# Copyright (c) 2014-2017 Intel, Inc. All rights reserved. # Copyright (c) 2016 Los Alamos National Security, LLC. All rights # reserved. # Copyright (c) 2017 Research Organization for Information Science @@ -12,8 +12,6 @@ # $HEADER$ # -EXTRA_DIST = autogen.subdirs - SUBDIRS = hwloc DIST_SUBDIRS=hwloc diff --git a/opal/mca/hwloc/hwloc2x/autogen.subdirs b/opal/mca/hwloc/hwloc2x/autogen.subdirs deleted file mode 100644 index beb596cf6af..00000000000 --- a/opal/mca/hwloc/hwloc2x/autogen.subdirs +++ /dev/null @@ -1 +0,0 @@ -hwloc diff --git a/opal/mca/hwloc/hwloc2x/hwloc/include/private/autogen/config.h.in b/opal/mca/hwloc/hwloc2x/hwloc/include/private/autogen/config.h.in index f65a8be4736..c42d8ce9da6 100644 --- a/opal/mca/hwloc/hwloc2x/hwloc/include/private/autogen/config.h.in +++ b/opal/mca/hwloc/hwloc2x/hwloc/include/private/autogen/config.h.in @@ -627,16 +627,12 @@ /* Define to 1 on x86_64 */ #undef HWLOC_X86_64_ARCH -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Define to 1 if scotch is netlocscotch is enabled */ #undef NETLOC_SCOTCH -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE @@ -725,4 +721,3 @@ #endif /* HWLOC_CONFIGURE_H */ -