Skip to content

jbig2dec: fix cross#266254

Merged
Mindavi merged 1 commit intostagingfrom
unknown repository
Dec 6, 2023
Merged

jbig2dec: fix cross#266254
Mindavi merged 1 commit intostagingfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Nov 8, 2023

Description of changes

jbig2dec's ./autogen.sh script expects to call ./configure itself, so any flags we want to have passed to ./configure (like --host) need to be passed to autogen.sh.

The simple way to accomplish this is to simply set configureScript to autogen.sh.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

jbig2dec's ./autogen.sh script expects to call ./configure itself,
so any flags we want to have passed to ./configure (like --host)
need to be passed to autogen.sh.

The simple way to accomplish this is to simply set configureScript
to autogen.sh.
@ghost ghost marked this pull request as ready for review November 8, 2023 12:09
@ofborg ofborg bot added 6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Nov 8, 2023
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 9, 2023
@ghost
Copy link
Copy Markdown
Author

ghost commented Nov 10, 2023

This can wait until after 23.11 branch-off.

@Mindavi Mindavi merged commit f073095 into NixOS:staging Dec 6, 2023
@ghost ghost deleted the pr/jbig2dec/fixcross branch January 18, 2024 07:21
brianmcgillion added a commit to brianmcgillion/ghaf that referenced this pull request May 31, 2024
fixed in upstream
NixOS/nixpkgs#266254

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
brianmcgillion added a commit to tiiuae/ghaf that referenced this pull request Jun 3, 2024
fixed in upstream
NixOS/nixpkgs#266254

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
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: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants