Skip to content

skip libatomic if mac#565

Merged
mjcarroll merged 1 commit into
ros2:rollingfrom
gftabor:patch-1
May 21, 2026
Merged

skip libatomic if mac#565
mjcarroll merged 1 commit into
ros2:rollingfrom
gftabor:patch-1

Conversation

@gftabor
Copy link
Copy Markdown
Contributor

@gftabor gftabor commented May 21, 2026

Description

skip libatomic if mac

This check is not correctly stopping -latomic from being used on all apple computers. This causes all downstream libraries to fail to link.

Fixes # (issue)
RoboStack/ros-jazzy#217

Is this user-facing behavior change?

Building

Did you use Generative AI?

No

Additional Information

Signed-off-by: Griffin Tabor <tabor473@gmail.com>
@mjcarroll mjcarroll merged commit 45756eb into ros2:rolling May 21, 2026
3 checks passed
@gftabor
Copy link
Copy Markdown
Contributor Author

gftabor commented May 21, 2026

I'd love this back ported into jazzy as well.

@fujitatomoya
Copy link
Copy Markdown
Collaborator

@Mergifyio backport lyrical kilted jazzy

@mergify
Copy link
Copy Markdown

mergify Bot commented May 24, 2026

backport lyrical kilted jazzy

✅ Backports have been created

Details

Cherry-pick of 45756eb has failed:

On branch mergify/bp/kilted/pr-565
Your branch is up to date with 'origin/kilted'.

You are currently cherry-picking commit 45756eb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CMakeLists.txt

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Cherry-pick of 45756eb has failed:

On branch mergify/bp/jazzy/pr-565
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit 45756eb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CMakeLists.txt

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

ahcorde pushed a commit that referenced this pull request May 25, 2026
(cherry picked from commit 45756eb)

Signed-off-by: Griffin Tabor <tabor473@gmail.com>
Co-authored-by: Griffin Tabor <tabor473@gmail.com>
ahcorde pushed a commit that referenced this pull request May 26, 2026
(cherry picked from commit 45756eb)

Signed-off-by: Tomoya.Fujita <tomoya.fujita825@gmail.com>
Co-authored-by: Griffin Tabor <tabor473@gmail.com>
Co-authored-by: Tomoya.Fujita <tomoya.fujita825@gmail.com>
ahcorde pushed a commit that referenced this pull request May 26, 2026
(cherry picked from commit 45756eb)

Signed-off-by: Tomoya.Fujita <tomoya.fujita825@gmail.com>
Co-authored-by: Griffin Tabor <tabor473@gmail.com>
Co-authored-by: Tomoya.Fujita <tomoya.fujita825@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants