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

recoll: fix cross #236492

Merged
merged 2 commits into from Jun 7, 2023
Merged

recoll: fix cross #236492

merged 2 commits into from Jun 7, 2023

Conversation

ghost
Copy link

@ghost ghost commented Jun 7, 2023

Description of changes

This commit fixes cross-compilation of recoll by:

  1. Disabling the python module when cross compiling

  2. Removing file from nativeBuildInputs, since it leaks into recoll-*.so, and forcing use of the hostPlatform file by adding the configureFlag that does that.

  3. Adding qtbase to nativeBuildInputs if withGui

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux (cross from x86_64-linux)
    • powerpc64le-linux
    • mips64el-linux (in progress)
  • Fits CONTRIBUTING.md.

Adam Joseph added 2 commits June 7, 2023 10:35
Cross-compiling the recoll python modules does not work and is not
easy to fix; for now we disable them.
This commit fixes cross-compilation of recoll by:

1. Disabling the python module when cross compiling

2. Removing `file` from `nativeBuildInputs`, since it leaks into
   recoll-*.so, and forcing use of the hostPlatform `file` by adding
   the configureFlag that does that.

3. Adding `qtbase` to `nativeBuildInputs` if `withGui`
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Jun 7, 2023
@ofborg ofborg bot requested review from jcumming and ehmry June 7, 2023 19:43
@ehmry ehmry merged commit d61bdc7 into NixOS:master Jun 7, 2023
@ghost ghost deleted the pr/recoll/fixcross branch January 23, 2024 06:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant