Fix compilation of hwloc
This commit is contained in:
parent
3d79d19aa2
commit
41df105ff5
22
third_party/hwloc/BUILD.bazel
vendored
22
third_party/hwloc/BUILD.bazel
vendored
@ -34,10 +34,10 @@ _INCLUDE_HWLOC_AUTOIGEN_CONFIG_H_COMMON_SUBS = {
|
||||
"#undef HWLOC_VERSION": "#define HWLOC_VERSION \"2.0.3\"",
|
||||
"#undef hwloc_pid_t": "#define hwloc_pid_t pid_t",
|
||||
"#undef hwloc_thread_t": "#define hwloc_thread_t pthread_t",
|
||||
"# undef HWLOC_HAVE_STDINT_H": "# define HWLOC_HAVE_STDINT_H 1 ",
|
||||
"# undef HWLOC_HAVE_STDINT_H": "# define HWLOC_HAVE_STDINT_H 1",
|
||||
"#undef HWLOC_SYM_TRANSFORM": "#define HWLOC_SYM_TRANSFORM 0",
|
||||
"#undef HWLOC_SYM_PREFIX": "#define HWLOC_SYM_PREFIX hwloc_",
|
||||
"#undef HWLOC_SYM_PREFIX_CAPS": "#define HWLOC_SYM_PREFIX_CAPS HWLOC_",
|
||||
"#undef HWLOC_SYM_PREFIX": "#define HWLOC_SYM_PREFIX hwloc_",
|
||||
}
|
||||
|
||||
_INCLUDE_HWLOC_AUTOIGEN_CONFIG_H_LINUX_SUBS = dict(_INCLUDE_HWLOC_AUTOIGEN_CONFIG_H_COMMON_SUBS)
|
||||
@ -83,8 +83,8 @@ _INCLUDE_PRIVATE_HWLOC_AUTOIGEN_CONFIG_H_COMMON_SUBS = {
|
||||
"#undef HAVE_DECL__STRDUP": "#define HAVE_DECL__STRDUP 0",
|
||||
"#undef HAVE_DIRENT_H": "#define HAVE_DIRENT_H 1",
|
||||
"#undef HAVE_DLFCN_H": "#define HAVE_DLFCN_H 1",
|
||||
"#undef HAVE_FFS": "#define HAVE_FFS 1",
|
||||
"#undef HAVE_FFSL": "#define HAVE_FFSL 1",
|
||||
"#undef HAVE_FFS": "#define HAVE_FFS 1",
|
||||
"#undef HAVE_GETPAGESIZE": "#define HAVE_GETPAGESIZE 1",
|
||||
"#undef HAVE_INTTYPES_H": "#define HAVE_INTTYPES_H 1",
|
||||
"#undef HAVE_LANGINFO_H": "#define HAVE_LANGINFO_H 1",
|
||||
@ -123,7 +123,6 @@ _INCLUDE_PRIVATE_HWLOC_AUTOIGEN_CONFIG_H_COMMON_SUBS = {
|
||||
"#undef HAVE_X11_XUTIL_H": "#define HAVE_X11_XUTIL_H 1",
|
||||
"#undef HAVE___PROGNAME": "#define HAVE___PROGNAME 1",
|
||||
"#undef HWLOC_C_HAVE_VISIBILITY": "#define HWLOC_C_HAVE_VISIBILITY 1",
|
||||
"#undef HWLOC_HAVE_ATTRIBUTE": "#define HWLOC_HAVE_ATTRIBUTE 1",
|
||||
"#undef HWLOC_HAVE_ATTRIBUTE_ALIGNED": "#define HWLOC_HAVE_ATTRIBUTE_ALIGNED 1",
|
||||
"#undef HWLOC_HAVE_ATTRIBUTE_ALWAYS_INLINE": "#define HWLOC_HAVE_ATTRIBUTE_ALWAYS_INLINE 1",
|
||||
"#undef HWLOC_HAVE_ATTRIBUTE_COLD": "#define HWLOC_HAVE_ATTRIBUTE_COLD 1",
|
||||
@ -142,14 +141,15 @@ _INCLUDE_PRIVATE_HWLOC_AUTOIGEN_CONFIG_H_COMMON_SUBS = {
|
||||
"#undef HWLOC_HAVE_ATTRIBUTE_UNUSED": "#define HWLOC_HAVE_ATTRIBUTE_UNUSED 1",
|
||||
"#undef HWLOC_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT": "#define HWLOC_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT 1",
|
||||
"#undef HWLOC_HAVE_ATTRIBUTE_WEAK_ALIAS": "#define HWLOC_HAVE_ATTRIBUTE_WEAK_ALIAS 1",
|
||||
"#undef HWLOC_HAVE_CPU_SET": "#define HWLOC_HAVE_CPU_SET 1",
|
||||
"#undef HWLOC_HAVE_ATTRIBUTE": "#define HWLOC_HAVE_ATTRIBUTE 1",
|
||||
"#undef HWLOC_HAVE_CPU_SET_S": "#define HWLOC_HAVE_CPU_SET_S 1",
|
||||
"#undef HWLOC_HAVE_DECL_FFS": "#define HWLOC_HAVE_DECL_FFS 1",
|
||||
"#undef HWLOC_HAVE_CPU_SET": "#define HWLOC_HAVE_CPU_SET 1",
|
||||
"#undef HWLOC_HAVE_DECL_FFSL": "#define HWLOC_HAVE_DECL_FFSL 1",
|
||||
"#undef HWLOC_HAVE_DECL_FFS": "#define HWLOC_HAVE_DECL_FFS 1",
|
||||
"#undef HWLOC_HAVE_DECL_STRCASECMP": "#define HWLOC_HAVE_DECL_STRCASECMP 1",
|
||||
"#undef HWLOC_HAVE_DECL_STRNCASECMP": "#define HWLOC_HAVE_DECL_STRNCASECMP 1",
|
||||
"#undef HWLOC_HAVE_FFS": "#define HWLOC_HAVE_FFS 1",
|
||||
"#undef HWLOC_HAVE_FFSL": "#define HWLOC_HAVE_FFSL 1",
|
||||
"#undef HWLOC_HAVE_FFS": "#define HWLOC_HAVE_FFS 1",
|
||||
"#undef HWLOC_HAVE_LIBTERMCAP": "#define HWLOC_HAVE_LIBTERMCAP 1",
|
||||
"#undef HWLOC_HAVE_LINUXIO": "#define HWLOC_HAVE_LINUXIO 1",
|
||||
"#undef HWLOC_HAVE_PTHREAD_MUTEX": "#define HWLOC_HAVE_PTHREAD_MUTEX 1",
|
||||
@ -160,24 +160,24 @@ _INCLUDE_PRIVATE_HWLOC_AUTOIGEN_CONFIG_H_COMMON_SUBS = {
|
||||
"#undef HWLOC_HAVE_X86_CPUID": "#define HWLOC_HAVE_X86_CPUID 1",
|
||||
"#undef HWLOC_SIZEOF_UNSIGNED_INT": "#define HWLOC_SIZEOF_UNSIGNED_INT 4",
|
||||
"#undef HWLOC_SIZEOF_UNSIGNED_LONG": "#define HWLOC_SIZEOF_UNSIGNED_LONG 8",
|
||||
"#undef HWLOC_SYM_PREFIX": "#define HWLOC_SYM_PREFIX hwloc_",
|
||||
"#undef HWLOC_SYM_PREFIX_CAPS": "#define HWLOC_SYM_PREFIX_CAPS HWLOC_",
|
||||
"#undef HWLOC_SYM_PREFIX": "#define HWLOC_SYM_PREFIX hwloc_",
|
||||
"#undef HWLOC_SYM_TRANSFORM": "#define HWLOC_SYM_TRANSFORM 0",
|
||||
"#undef HWLOC_USE_NCURSES": "#define HWLOC_USE_NCURSES 1",
|
||||
"#undef HWLOC_VERSION": "#define HWLOC_VERSION \"2.0.3\"",
|
||||
"#undef HWLOC_VERSION_GREEK": "#define HWLOC_VERSION_GREEK \"\"",
|
||||
"#undef HWLOC_VERSION_MAJOR": "#define HWLOC_VERSION_MAJOR 2",
|
||||
"#undef HWLOC_VERSION_MINOR": "#define HWLOC_VERSION_MINOR 0",
|
||||
"#undef HWLOC_VERSION_RELEASE": "#define HWLOC_VERSION_RELEASE 3",
|
||||
"#undef HWLOC_VERSION": "#define HWLOC_VERSION \"2.0.3\"",
|
||||
"#undef HWLOC_X86_64_ARCH": "#define HWLOC_X86_64_ARCH 1",
|
||||
"#undef LT_OBJDIR": "#define LT_OBJDIR \".libs/\"",
|
||||
"#undef PACKAGE": "#define PACKAGE \"hwloc\"",
|
||||
"#undef PACKAGE_BUGREPORT": "#define PACKAGE_BUGREPORT \"http://github.com/open-mpi/hwloc/i",
|
||||
"#undef PACKAGE_BUGREPORT": "#define PACKAGE_BUGREPORT \"http://github.com/open-mpi/hwloc/issues",
|
||||
"#undef PACKAGE_NAME": "#define PACKAGE_NAME \"hwloc\"",
|
||||
"#undef PACKAGE_STRING": "#define PACKAGE_STRING \"hwloc 2.0.3\"",
|
||||
"#undef PACKAGE_TARNAME": "#define PACKAGE_TARNAME \"hwloc\"",
|
||||
"#undef PACKAGE_URL": "#define PACKAGE_URL \"\"",
|
||||
"#undef PACKAGE_VERSION": "#define PACKAGE_VERSION \"2.0.3\"",
|
||||
"#undef PACKAGE": "#define PACKAGE \"hwloc\"",
|
||||
"#undef SIZEOF_UNSIGNED_INT": "#define SIZEOF_UNSIGNED_INT 4",
|
||||
"#undef SIZEOF_UNSIGNED_LONG": "#define SIZEOF_UNSIGNED_LONG 8",
|
||||
"#undef SIZEOF_VOID_P": "#define SIZEOF_VOID_P 8",
|
||||
|
2
third_party/hwloc/static-components.h
vendored
2
third_party/hwloc/static-components.h
vendored
@ -22,7 +22,7 @@ static const struct hwloc_component* hwloc_static_components[] = {
|
||||
&hwloc_xml_component,
|
||||
&hwloc_synthetic_component,
|
||||
&hwloc_xml_nolibxml_component,
|
||||
#ifdef __Linux__
|
||||
#ifdef __linux__
|
||||
&hwloc_linux_component,
|
||||
&hwloc_linuxio_component,
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user