Skip to content

openexr: backport gcc-13 fix#234876

Merged
trofi merged 1 commit intoNixOS:stagingfrom
trofi:openexr-gcc-13-fix
Jun 5, 2023
Merged

openexr: backport gcc-13 fix#234876
trofi merged 1 commit intoNixOS:stagingfrom
trofi:openexr-gcc-13-fix

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented May 29, 2023

Without the change openexr build on gcc-13 fails as:

[ 99%] Building CXX object src/test/OpenEXRTest/CMakeFiles/OpenEXRTest.dir/testInputPart.cpp.o
openexr/src/bin/exrcheck/main.cpp: In function 'bool exrCheck(const char*, bool, bool, bool, bool)':
openexr/src/bin/exrcheck/main.cpp:65:15: error: 'uintptr_t' does not name a type
   65 |         const uintptr_t kMaxSize = uintptr_t (-1) / 4;
      |               ^~~~~~~~~
Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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.05 Release Notes (or backporting 22.11 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.

@trofi trofi mentioned this pull request May 29, 2023
12 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely 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 May 29, 2023
Without the change `openexr` build on `gcc-13` fails as:

    [ 99%] Building CXX object src/test/OpenEXRTest/CMakeFiles/OpenEXRTest.dir/testInputPart.cpp.o
    openexr/src/bin/exrcheck/main.cpp: In function 'bool exrCheck(const char*, bool, bool, bool, bool)':
    openexr/src/bin/exrcheck/main.cpp:65:15: error: 'uintptr_t' does not name a type
       65 |         const uintptr_t kMaxSize = uintptr_t (-1) / 4;
          |               ^~~~~~~~~
@trofi trofi force-pushed the openexr-gcc-13-fix branch from 414e6b8 to d55edbc Compare June 5, 2023 07:02
@trofi
Copy link
Contributor Author

trofi commented Jun 5, 2023

Rebased past staging conflict.

@trofi trofi merged commit 992c2ab into NixOS:staging Jun 5, 2023
@trofi trofi deleted the openexr-gcc-13-fix branch June 5, 2023 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant