fix for the apply of the HWLOC security patch #849
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bratpiorka
force-pushed
the
rrudnick_hwloc_patch_fix
branch
from
dff3446 to
eec25d5
Compare
bratpiorka
changed the title
bratpiorka
changed the title
bratpiorka
force-pushed
the
rrudnick_hwloc_patch_fix
branch
from
eec25d5 to
05f3b94
Compare
KFilipek
reviewed
Oct 30, 2024
| @@ -217,6 +202,22 @@ else() | |||
| message(STATUS " LIBHWLOC_LIBRARY_DIRS = ${LIBHWLOC_LIBRARY_DIRS}") | |||
| endif() | |||
|
|
|||
| if(hwloc_targ_SOURCE_DIR) | |||
| # apply security patch for HWLOC | |||
| execute_process( | |||
There was a problem hiding this comment.
Look at the options named ECHO_OUTPUT_VARIABLE, ECHO_ERROR_VARIABLE.
Generally it's not blocking, but probably you can remove all if blocks below.
Source: https://cmake.org/cmake/help/latest/command/execute_process.html
There was a problem hiding this comment.
ok but this is enabled in cmake >= 3.18 and I do not want to bump min required ver right now
PatKamin
reviewed
Oct 30, 2024
PatKamin
reviewed
Oct 30, 2024
bratpiorka
force-pushed
the
rrudnick_hwloc_patch_fix
branch
from
05f3b94 to
6c828f6
Compare
PatKamin
reviewed
Oct 30, 2024
PatKamin
approved these changes
Oct 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix for the apply of the HWLOC security patch
This is a fix for a scenario where the user runs the cmake configuration with the UMF_LINK_HWLOC_STATICALLY setting multiple times for the same build directory. On the first run, cmake downloads the HWLOC sources and successfully applies the required security patch, but the patching fails the second time (the patch has already been applied). This PR fixes this error.