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

fix unbundled build with pyside6 #3267

Closed
wants to merge 1 commit into from

Conversation

chayleaf
Copy link

@chayleaf chayleaf commented Nov 21, 2023

Your checklist for this pull request

Detailed description

This fixes 2 issues with the build script.

  1. BUILD_INTERFACE and INSTALL_INTERFACE weren't being expanded in this particular case (for SHIBOKEN_INCLUDE_DIRS), which broke build, so I simply changed it to reference the directories directly.
  2. Without bundled Rizin, rz_core wasn't in SHIBOKEN_INCLUDE_DIRS. This adds code to remedy this issue.

Test plan (required)

Make sure this builds with Pyside 6 and without bundling Rizin. Personally I used the following flags: -DCUTTER_USE_BUNDLED_RIZIN=OFF -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=ON -DCUTTER_ENABLE_GRAPHVIZ=ON -DCUTTER_QT6=ON

Note that if you have most stuff in /usr or /usr/local, the issue might not have appeared on your system at all even before this commit. In my case, it's necessary for building Cutter on NixOS: NixOS/nixpkgs#268874.

Closing issues

@karliss karliss self-requested a review November 21, 2023 07:15
@karliss
Copy link
Member

karliss commented Nov 21, 2023

@chayleaf can you try the code from #3268 I don't have a NixOS enviornment set up

Didn't yet try to with nonbundled rizin, but I have a feeling that the whole copy pasted header handling part which was introduced in #2952 needs to be removed.

@chayleaf
Copy link
Author

closing in favor of #3268

@chayleaf chayleaf closed this Nov 22, 2023
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.

2 participants