Skip to content

[23340] Fix build on QNX (backport #5871)#5883

Merged
MiguelCompany merged 3 commits into2.14.xfrom
mergify/bp/2.14.x/pr-5871
Jun 30, 2025
Merged

[23340] Fix build on QNX (backport #5871)#5883
MiguelCompany merged 3 commits into2.14.xfrom
mergify/bp/2.14.x/pr-5871

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 18, 2025

Description

This fixes the build on QNX reported in #5865. I have only checked it in master and 3.2.x, so the backport to 2.14.x might need some rework.

Note: changes to the asio patch have mostly been taken from this commit

@Mergifyio backport 3.2.x 2.14.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • N/A: Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • N/A: Any new/modified methods have been properly documented using Doxygen.

  • N/A: Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • N/A: New feature has been added to the versions.md file (if applicable).

  • N/A: New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • N/A Check CI results: changes do not issue any warning.
  • N/A Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5871 done by [Mergify](https://mergify.com).

* Refs #23339. Update QNX patches

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>

* Refs #23339. Fix threading_pthread.ipp

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Your Name <you@example.com>
(cherry picked from commit 14dc063)
@mergify mergify bot mentioned this pull request Jun 18, 2025
9 tasks
@MiguelCompany MiguelCompany added this to the v2.14.5 milestone Jun 18, 2025
@MiguelCompany MiguelCompany added the no-test Skip CI tests if PR marked with this label label Jun 18, 2025
@MiguelCompany MiguelCompany requested a review from Mario-DL June 18, 2025 10:32
@github-actions github-actions bot added the ci-pending PR which CI is running label Jun 18, 2025
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Mario-DL
Mario-DL previously approved these changes Jun 19, 2025
Copy link
Copy Markdown
Contributor

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

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

LGTM, build passing with the fix above

@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL June 19, 2025 08:09
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL June 19, 2025 08:17
@MiguelCompany MiguelCompany merged commit ca52317 into 2.14.x Jun 30, 2025
16 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.14.x/pr-5871 branch June 30, 2025 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-pending PR which CI is running no-test Skip CI tests if PR marked with this label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants