Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolving hwloc cmake build issues #3847

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Resolving hwloc cmake build issues #3847

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions contrib/hwloc/config/hwloc.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,28 +140,43 @@ EOF])
AC_CONFIG_HEADERS(hwloc_config_prefix[include/private/autogen/config.h])
AC_CONFIG_HEADERS(hwloc_config_prefix[include/hwloc/autogen/config.h])


# What prefix are we using?
AC_MSG_CHECKING([for hwloc symbol prefix])
AH_VERBATIM([prefix_details_ifndef],
[ /* hwloc details should only be set once */
#ifndef HWLOC_SYM_DETAILS
#define HWLOC_SYM_DETAILS
])
AC_MSG_CHECKING([for hwloc symbol prefix])
AS_IF([test "$hwloc_symbol_prefix_value" = ""],
[AS_IF([test "$with_hwloc_symbol_prefix" = ""],
[hwloc_symbol_prefix_value=hwloc_],
[hwloc_symbol_prefix_value=$with_hwloc_symbol_prefix])])


AC_DEFINE_UNQUOTED(HWLOC_SYM_PREFIX, [$hwloc_symbol_prefix_value],
[The hwloc symbol prefix])
# Ensure to [] escape the whole next line so that we can get the
# proper tr tokens
[hwloc_symbol_prefix_value_caps="`echo $hwloc_symbol_prefix_value | tr '[:lower:]' '[:upper:]'`"]
AC_DEFINE_UNQUOTED(HWLOC_SYM_PREFIX_CAPS, [$hwloc_symbol_prefix_value_caps],
[The hwloc symbol prefix in all caps])
AC_CHECK_DEFINE([HWLOC_SYM_PREFIX_CAPS],[0],AC_DEFINE_UNQUOTED(HWLOC_SYM_PREFIX_CAPS, [$hwloc_symbol_prefix_value_caps],
[The hwloc symbol prefix in all caps]))
AC_MSG_RESULT([$hwloc_symbol_prefix_value])

# Give an easy #define to know if we need to transform all the

# Give an easy #define to know if we need to transform all the
# hwloc names
AH_TEMPLATE([HWLOC_SYM_TRANSFORM], [Whether we need to re-define all the hwloc public symbols or not])
AS_IF([test "$hwloc_symbol_prefix_value" = "hwloc_"],
[AC_DEFINE([HWLOC_SYM_TRANSFORM], [0])],
[AC_DEFINE([HWLOC_SYM_TRANSFORM], [1])])

AH_VERBATIM([prefix_details_endif],
[ /* HWLOC_DETAILS_SET */
#endif
])


# Disabled for Charm++ due to https://github.com/charmplusplus/charm/issues/2606
# hwloc 2.0+ requires a C99 compliant compiler
# AC_PROG_CC_C99 obsolete, detected inside AC_PROG_CC, since autoconf 2.70
Expand Down
Loading