Skip to content

recoll: fix cross#236492

Merged
2 commits merged intomasterfrom
unknown repository
Jun 7, 2023
Merged

recoll: fix cross#236492
2 commits merged intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@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 a user and jcumming June 7, 2023 19:43
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jun 7, 2023
@ghost ghost deleted the pr/recoll/fixcross branch January 23, 2024 06:49
This pull request was closed.
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 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants