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.

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

[libfork] update to version 3.8.0 #38678

Merged
merged 8 commits into from May 15, 2024

Conversation

ConorWilliams
Copy link
Contributor

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version.
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@ConorWilliams ConorWilliams changed the title Update libfork to version 3.8.0 [libfork ] update to version 3.8.0 May 10, 2024
@ConorWilliams ConorWilliams changed the title [libfork ] update to version 3.8.0 [libfork] update to version 3.8.0 May 10, 2024
@ConorWilliams
Copy link
Contributor Author

Not sure why CI is failing, output is this:


Triplet: x64-osx
RESULTS
  vcpkg-cmake:x64-osx: SUCCEEDED: 27.6 ms
  vcpkg-cmake-config:x64-osx: SUCCEEDED: 11.9 ms
  vcpkg-tool-meson:x64-osx: SUCCEEDED: 19.4 ms
  pkgconf:x64-osx: SUCCEEDED: 38.2 ms
  hwloc:x64-osx: SUCCEEDED: 94.5 ms
  libfork:x64-osx: SUCCEEDED: 11 s

SUMMARY FOR x64-osx
  SUCCEEDED: 6

##[error]PowerShell wrote one or more lines to the standard error stream.
##[error]pwsh(10783) MallocStackLogging: can't turn off malloc stack logging because it was not enabled.

##[error]pwsh(10786) MallocStackLogging: can't turn off malloc stack logging because it was not enabled.

Finishing: *** Test Modified Ports

Looks like it should be green to me?

@JonLiu1993 JonLiu1993 self-assigned this May 11, 2024
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label May 11, 2024
"description": "A bleeding-edge, lock-free, wait-free, continuation-stealing fork-join library built on C++20's coroutines.",
"homepage": "https://github.com/conorwilliams/libfork",
"license": "MPL-2.0",
"dependencies": [
"boost-atomic",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ConorWilliams, Thanks for your PR, could you please clarify why remove boost-atomic add pkgconf dependencies?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JonLiu1993 libfork used to support boost-atomic as an optional dependency, this support has been dropped in 3.8 and replaced with a port of just a small portion that was used. The hwloc package exports a .pc file which requires pkgconf to find.

"hwloc",
"pkgconf",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't require to build pkgconf for the target (!).

Suggested change
"pkgconf",

Instead, modify the portfile:

vcpkg_find_acquire_program(PKGCONFIG)
...
vcpkg_cmake_configure(
    ...
    OPTIONS
        "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
    ...
)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW it should be verifies that the exported CMake config doesn't contain unresolved imported targets for hwloc.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @dg0yt, I have made the changes you suggested

Comment on lines 2 to 11
OUT_SOURCE_PATH
SOURCE_PATH
REPO
conorwilliams/libfork
REF
"v${VERSION}"
SHA512
38a8a6fe0f360f1caa123b227996490f192f8b58340ecb5d91922c15d7ca9b364031716e139a3ab0d89cd7cdf3bfb22fcf75272e76a40513c55adaf00ff6454d
HEAD_REF
main)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ConorWilliams, Could you plesae restore the format of this portfile.cmake to its previous format? Comparative standards before.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, thanks @JonLiu1993

@JonLiu1993
Copy link
Member

Tested usage successfully by libfork:x64-windows:

libfork provides CMake targets:

    find_package(libfork CONFIG REQUIRED)
    target_link_libraries(main PRIVATE libfork::libfork)

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label May 15, 2024
@data-queue data-queue merged commit 28c4ec8 into microsoft:master May 15, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants