[hwloc] update to 2.7.0 #22060
Merged
[hwloc] update to 2.7.0 #22060
Conversation
This file contains 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
FrankXie05
added
info:internal
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
FrankXie05
commented
Dec 17, 2021
| @@ -1,10 +1,10 @@ | |||
| vcpkg_from_github( | |||
| OUT_SOURCE_PATH SOURCE_PATH | |||
| REPO open-mpi/hwloc | |||
| REF 5e185ccfff2728fa351cea41f6d9fefebfb88078 # hwloc-2.5.0 | |||
| SHA512 96f6421c40eede3a3c273a1ffa06accc43767421d5fb7b402a83caea1ef1a3bb8282c08ed94bc696296f37f3df80cd86403dac1012f2218b674569c8afcf3de9 | |||
| PATCHES fix_wrong_ifdef.patch | |||
There was a problem hiding this comment.
fix_wrong_ifdef.patch has been merged
Missing some frameworks on osx ? |
if (APPLE)
find_library(COREFOUNDATION_LIBRARY CoreFoundation)
target_link_libraries(... PUBLIC ${COREFOUNDATION_LIBRARY})
endif (APPLE) |
Neumann-A
reviewed
Dec 21, 2021
ports/hwloc/portfile.cmake
Outdated
| ) | ||
|
|
||
| if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) | ||
| set(OPTIONS ac_cv_prog_cc_c99= # To avoid the compiler check for C99 which will fail for MSVC | ||
| --disable-plugin-dlopen) | ||
| endif() | ||
|
|
||
| if(VCPKG_TARGET_IS_OSX) | ||
| set(LDFLAGS "-framework CoreFoundation") |
Neumann-A
reviewed
Dec 21, 2021
ports/hwloc/portfile.cmake
Outdated
Comment on lines
15
to
19
| if(VCPKG_TARGET_IS_OSX) | ||
| set(LDFLAGS "-lCoreFoundation") | ||
| else() | ||
| set(LDFLAGS "") | ||
| endif() |
There was a problem hiding this comment.
The way you set it here won't be use by vcpkg_configure_make
You can add it to
list(APPEND OPTIONS "HWLOC_LDFLAGS=${LDFLAGS} -no-undefined")
but I am uncertain if this will work with the extra space.
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
list(APPEND OPTIONS "HWLOC_LDFLAGS=-no-undefined")
elseif(VCPKG_TARGET_IS_OSX)
list(APPEND OPTIONS "HWLOC_LDFLAGS=-framework CoreFoundation")
endif()
But actually: This is a flag which belongs patched into the Makefiles/configure script for OSX.
There was a problem hiding this comment.
Thanks, I will try it. :)
added 2 commits
January 19, 2022 07:10
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 291b84e651bc21d90088394139097f9a5396cc00 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index 0d3237f..3e333a8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2710,7 +2710,7 @@
},
"hpx": {
"baseline": "1.7.1",
- "port-version": 3
+ "port-version": 4
},
"http-parser": {
"baseline": "2.9.4",
diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json
index f0af19d..c4b8777 100644
--- a/versions/h-/hpx.json
+++ b/versions/h-/hpx.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "bb32915e1e00c5d8390334cb7d32696e444aec1a",
+ "version-semver": "1.7.1",
+ "port-version": 4
+ },
{
"git-tree": "ca0e813d228cd5ea6e5c05ae81e7e89e825783d0",
"version-semver": "1.7.1",
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 291b84e651bc21d90088394139097f9a5396cc00 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json
index c4b8777..d230dd5 100644
--- a/versions/h-/hpx.json
+++ b/versions/h-/hpx.json
@@ -1,7 +1,7 @@
{
"versions": [
{
- "git-tree": "bb32915e1e00c5d8390334cb7d32696e444aec1a",
+ "git-tree": "398a8a59f2b7fecd1a2cda995079e2c065550dbe",
"version-semver": "1.7.1",
"port-version": 4
},
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout c93faafe6d892aca636765e3a7e67797736b0b09 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/h-/hwloc.json b/versions/h-/hwloc.json
index 1d9d630..b394443 100644
--- a/versions/h-/hwloc.json
+++ b/versions/h-/hwloc.json
@@ -1,11 +1,11 @@
{
"versions": [
{
-
- "git-tree": "9fa020686d407c3238f185483a82267d1d4c6001",
+ "git-tree": "77c9d945bc93cb15a46e7b72da6aceccf6342afd",
"version": "2.7.0",
"port-version": 0
},
+ {
"git-tree": "fda6ebfe17a601d067ee6809571bedbedb590eef",
"version": "2.5.0",
"port-version": 3You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/hpx/vcpkg.jsonports/hwloc/vcpkg.json
Valid values for the license field can be found in the documentation
There was a problem hiding this comment.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/hpx/vcpkg.jsonports/hwloc/vcpkg.json
Valid values for the license field can be found in the documentation
There was a problem hiding this comment.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/hpx/vcpkg.jsonports/hwloc/vcpkg.json
Valid values for the license field can be found in the documentation
There was a problem hiding this comment.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/hwloc/vcpkg.json
Valid values for the license field can be found in the documentation
JackBoosY
approved these changes
Feb 15, 2022
|
This LGTM, thanks for the update and fixes! |
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 #20899
Fix #21504
[hwloc] update to the latest version 2.7.0
All features have been tested successfullly in the following triplet: