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

[libatomic-ops] New port #21285

Merged
merged 2 commits into from
Nov 13, 2021
Merged

Conversation

ivmai
Copy link
Contributor

@ivmai ivmai commented Nov 9, 2021

  • What does your PR fix?

Adds libatomic-ops port (it will be needed for bdwgc port with multi-threading support).

  • Which triplets are supported/not supported? Have you updated the CI baseline?

all

Yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

Yes

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/bdwgc/portfile.cmake
  • ports/libatomic-ops/portfile.cmake

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/bdwgc/portfile.cmake
  • ports/libatomic-ops/portfile.cmake

@JonLiu1993 JonLiu1993 added category:new-port The issue is requesting a new library to be added; consider making a PR! category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist labels Nov 10, 2021
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/libatomic-ops/portfile.cmake

@ivmai
Copy link
Contributor Author

ivmai commented Nov 12, 2021

The PR contains 2 commits, but I'm going to polish and test 1st one, and then add the 2nd one.

@ivmai ivmai changed the title [bdwgc] enable threads [libatomic-ops] New port Nov 12, 2021
@ivmai
Copy link
Contributor Author

ivmai commented Nov 12, 2021

The PR contains 2 commits, but I'm going to polish and test 1st one, and then add the 2nd one.

I've decided to leave libatomic-ops port addition here, and create another PR enabling multi-threading in bdwgc.

@JonLiu1993, please remove category:port-feature label.

@ivmai ivmai marked this pull request as ready for review November 12, 2021 17:59
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for libatomic-ops but no changes to version or port version.
-- Version: 7.7.0
-- Old SHA: 190e60a8fc88f307a5fd036acbce1716cd941367
-- New SHA: 6d7b45bb0c10342d8e43900fab12f2baab4eb6a1
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

Copy link
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

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

Thanks for the PR and awesome library!

I noticed that the CMake package name is "Atomic_ops", so I adjusted the helper calls to correctly account for that name. I now get:

$ vcpkg install libatomic-ops
...
Elapsed time for package libatomic-ops:x64-linux: 703 ms

Total elapsed time: 966.5 ms

The package libatomic-ops provides CMake targets:

    find_package(Atomic_ops CONFIG REQUIRED)
    target_link_libraries(main PRIVATE Atomic_ops::atomic_ops Atomic_ops::atomic_ops_gpl)

@ivmai
Copy link
Contributor Author

ivmai commented Nov 13, 2021

I noticed that the CMake package name is "Atomic_ops", so I adjusted the helper calls to correctly account for that name

Okay, thank you.

@ras0219-msft ras0219-msft merged commit 25f317b into microsoft:master Nov 13, 2021
@ras0219-msft ras0219-msft removed the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Nov 13, 2021
@ivmai ivmai deleted the bdwgc-enable-threads branch November 14, 2021 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:new-port The issue is requesting a new library to be added; consider making a PR!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants