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

[benchmark] Fix build failure under QNX #35644

Merged
merged 3 commits into from
Jan 30, 2024

Conversation

jimwang118
Copy link
Contributor

@jimwang118 jimwang118 commented Dec 13, 2023

Fixes #35510

Use C++ casts.

  • 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.

Usage test pass with following triplets:

x86-windows
x64-windows

@jimwang118 jimwang118 added category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. labels Dec 13, 2023
@jimwang118 jimwang118 changed the title [benchmark] Fix build for QNX failure [benchmark] Fix build failure under QNX Dec 13, 2023
@jimwang118 jimwang118 marked this pull request as ready for review December 15, 2023 08:34
@LilyWangLL LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label Dec 18, 2023
@BillyONeal
Copy link
Member

I think this needs to be submitted upstream, and I would like to see confirmation from @Arech that it actually fixes something because the problem will not repro on anything we currently have the capacity to test.

@BillyONeal BillyONeal removed the info:reviewed Pull Request changes follow basic guidelines label Dec 18, 2023
@BillyONeal BillyONeal marked this pull request as draft December 18, 2023 21:14
@Arech
Copy link

Arech commented Dec 18, 2023

Well, with the exception of adding -Werror=old-style-cast it's the same patch, that I have suggested, so it should work...
But I'll test it tomorrow anyway and will get back to you with the results. It's 23:35 here, good night everyone...

@jimwang118
Copy link
Contributor Author

Track the upstream issue 1707.

@Arech
Copy link

Arech commented Dec 19, 2023

I can confirm that the PR indeed compiles and works on QNX as expected

In the manifest:

"default-registry": {
  "kind": "git",
  "repository": "https://github.com/jimwang118/vcpkg",
  "reference": "fixbenchmark",
  "baseline": "0d6278ea26eecd1ebd3cbb2d183d3eb0cee6cf5c"
},
benchmarks$ . $QNXSDP/qnx710/qnxsdp-env.sh
...
benchmarks$ rm -rf ./build_qnx; cmake -B ./build_qnx -G Ninja -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=aarch64-qnx.cmake -DCMAKE_BUILD_TYPE=Release && cmake --build ./build_qnx -j 8
...
-- Running vcpkg install
warning: Embedding `vcpkg-configuration` in a manifest file is an EXPERIMENTAL feature.
Fetching registry information from https://github.com/jimwang118/vcpkg (fixbenchmark)...
...
The following packages will be built:
    benchmark:[email protected]#1 -- ...
...
Installing 85/165 benchmark:[email protected]#1...
Building benchmark:[email protected]#1...
-- [OVERLAY] Loading triplet configuration from: .../arm64-qnx.cmake
...
-- Applying patch fix_qnx.patch
...
-- Configuring arm64-qnx
-- Building arm64-qnx-dbg
-- Building arm64-qnx-rel
...

I run the binary on a device with QNX and it worked as expected.

@jimwang118 jimwang118 added the depends:upstream-changes Waiting on a change to the upstream project label Dec 20, 2023
@jimwang118
Copy link
Contributor Author

The upstream fix PR 1739 has been merged.

@jimwang118 jimwang118 marked this pull request as ready for review January 29, 2024 08:25
@jimwang118 jimwang118 removed the depends:upstream-changes Waiting on a change to the upstream project label Jan 29, 2024
@LilyWangLL LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label Jan 29, 2024
@data-queue data-queue merged commit 7f3acf6 into microsoft:master Jan 30, 2024
16 checks passed
TomKatom pushed a commit to TomKatom/vcpkg that referenced this pull request Feb 23, 2024
* QNX

* update verison

---------

Co-authored-by: Jim wang (BEYONDSOFT CONSULTING INC) <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[benchmark] build for QNX failure. Patch suggestion
5 participants