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

[capstone] update to 5.0.0-rc2 #23979

Merged
merged 6 commits into from
Apr 8, 2022

Conversation

theblackunknown
Copy link
Contributor

@theblackunknown theblackunknown commented Apr 4, 2022

Describe the pull request

This PR upgrades the capstone port to 5.0.0-rc2 version.
This update allows us to simplify the portfile.cmake thanks to recent improvements.

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

They are all supported, no update was made to ci.baseline.txt

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 vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/capstone/vcpkg.json

Valid values for the license field can be found in the documentation

@JonLiu1993 JonLiu1993 self-assigned this Apr 6, 2022
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Apr 6, 2022
@JonLiu1993
Copy link
Member

@theblackunknown ,Thanks for your pr, looks the ci tested failed on many triplets,
This is error log, Please take a look
install-x86-windows-dbg-out.log

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 triton but no changes to version or port version.
-- Version: 0.9#1
-- Old SHA: 1463df6dd74dfea7d12a8610b23009259b5c1e57
-- New SHA: c815d81ae82f2dd1d0fdcecc5e4c710297cadfe8
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/capstone/vcpkg.json

Valid values for the license field can be found in the documentation

@theblackunknown
Copy link
Contributor Author

@JonLiu1993 Indeed, the triton port has been impacted.
I have just pushed a series of changes which should solves this, I'll check later the CI results.

@theblackunknown
Copy link
Contributor Author

theblackunknown commented Apr 6, 2022

Commit a15961a is irrelevant to this PR but I have noticed an error in the way the library linkage was done for triton.

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!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 01d6f6ff1e5332b926099f0c23bda996940ad4e8 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/t-/triton.json b/versions/t-/triton.json
index 990b30c..b4daf87 100644
--- a/versions/t-/triton.json
+++ b/versions/t-/triton.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "c815d81ae82f2dd1d0fdcecc5e4c710297cadfe8",
+      "git-tree": "ae7bc963fc22c2865bc3e7a5460874c06870e386",
       "version": "0.9",
       "port-version": 2
     },

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/capstone/vcpkg.json

Valid values for the license field can be found in the documentation

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!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout cc2dd8fed39acc588c9a9a04b1ea4d04ce5308f0 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/t-/triton.json b/versions/t-/triton.json
index 990b30c..2bc4063 100644
--- a/versions/t-/triton.json
+++ b/versions/t-/triton.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "c815d81ae82f2dd1d0fdcecc5e4c710297cadfe8",
+      "git-tree": "220ce7aa574609f64206fc02906b1bd2eafbc8aa",
       "version": "0.9",
       "port-version": 2
     },

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/capstone/vcpkg.json

Valid values for the license field can be found in the documentation

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 vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/capstone/vcpkg.json

Valid values for the license field can be found in the documentation

@JonLiu1993
Copy link
Member

@theblackunknown ,Fixed a lot of triplets, now only UWP is left,
install-x64-uwp-dbg-out.log

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 vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/capstone/vcpkg.json

Valid values for the license field can be found in the documentation

@theblackunknown
Copy link
Contributor Author

Looks @JonLiu1993 ! It is all green !

@theblackunknown theblackunknown changed the title [capstone] update to 5.0.0 alpha [capstone] update to 5.0.0-rc2 Apr 7, 2022
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 vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/capstone/vcpkg.json

Valid values for the license field can be found in the documentation

@JonLiu1993 JonLiu1993 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Apr 8, 2022
@strega-nil-ms
Copy link
Contributor

Thanks!

@strega-nil-ms strega-nil-ms merged commit 65c66cd into microsoft:master Apr 8, 2022
ekilmer added a commit to ekilmer/vcpkg that referenced this pull request Apr 12, 2022
* master: (139 commits)
  [dstorage] Add port for Microsoft.Direct3D.DirectStorage NuGet (microsoft#24063)
  [vcpkg] Refactor toolchain & generator selection (microsoft#23846)
  [icu] update to 70.1 (microsoft#23445)
  [vcpkg] Update android usage documentation (microsoft#23690)
  [LMDB] update to 0.9.29 (microsoft#24045)
  [catch2] Don't install docs (microsoft#24046)
  [harfbuff] fix arm64 osx build (microsoft#24055)
  [openxr-loader] remove from CI baseline (microsoft#24057)
  [imath] Update to 3.1.5 (microsoft#24059)
  [openssl] Fix dynamic builds on UNIX (microsoft#24061)
  [c-ares] update to 1.18.1 (microsoft#24062)
  [igraph] update to 0.9.8 (microsoft#24065)
  [cmake-user] Fix library check (microsoft#24070)
  [openxr-loader] fix ci.baseline.txt (microsoft#24073)
  [tinycbor] Fix file conflicts with libcbor (microsoft#24056)
  [graphviz,libslirp] Limit msys to windows (microsoft#24032)
  [bdwgc] Don't build docs (microsoft#24025)
  [capstone] update to 5.0.0-rc2 (microsoft#23979)
  [clockutils] Fix x64-windows-static-md (microsoft#23965)
  [braft] New port (microsoft#23830)
  ...
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.

3 participants