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.

Sign up for GitHub

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

Jump to bottom

openexr, ilmbase: Fix compilation on non-glibc. #94205

Merged
merged 1 commit into from
Aug 10, 2020
Merged

openexr, ilmbase: Fix compilation on non-glibc. #94205

merged 1 commit into from
Aug 10, 2020

Conversation

nh2
Copy link
Contributor

@nh2 nh2 commented Jul 30, 2020

Motivation for this change

musl compatibility via nh2/static-haskell-nix#98.

Tested with musl.

I PRd the patch upstream: AcademySoftwareFoundation/openexr#798

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@nh2 nh2 requested a review from dtzWill July 30, 2020 00:43
@nh2 nh2 self-assigned this Jul 30, 2020
@nh2 nh2 mentioned this pull request Jul 30, 2020
Merged
5 tasks
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 30, 2020
@nh2
nixpkgs: Update submodule:
0e1002a 
* include workaround for NixOS/nixpkgs#85924
* musl 1.2.0 (#98 (comment))
* workaround for fontforge execution failure due to wrong RPATH (NixOS/nixpkgs#94126)
* ilmbase musl compilation error (NixOS/nixpkgs#94205)
* mesa: Fix `-Werror=int-conversion` build error on musl

fixup! nixpkgs: Update submodule:
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 30, 2020
@nh2
nixpkgs: Update submodule:
76cc600 
* include workaround for NixOS/nixpkgs#85924
* musl 1.2.0 (#98 (comment))
* workaround for fontforge execution failure due to wrong RPATH (NixOS/nixpkgs#94126)
* ilmbase musl compilation error (NixOS/nixpkgs#94205)
* mesa: Fix `-Werror=int-conversion` build error on musl (NixOS/nixpkgs#94207)
@nh2 nh2 force-pushed the ilmbase-non-glibc-fpstate branch from 66b9031 to d939373 Compare August 2, 2020 13:48
@nh2
Copy link
Contributor Author

nh2 commented Aug 2, 2020

Updated to avoid rebuild on Darwin.

risicle
risicle reviewed Aug 10, 2020
View reviewed changes
pkgs/development/libraries/openexr/default.nix
non_glibc_fpstate_patch =
# Fix ilmbase/openexr using glibc-only fpstate.
# Found via https://git.alpinelinux.org/aports/tree/community/openexr/10-musl-_fpstate.patch?id=80d9611b7b8e406a554c6f511137e03ff26acbae,
# TODO Remove when https://github.com/AcademySoftwareFoundation/openexr/pull/798 is merged and available.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks to be merged now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not available though (no release made).

@nh2
Copy link
Contributor Author

nh2 commented Aug 10, 2020

Merging as this has 0-rebuilds and it fixes musl builds.

@nh2 nh2 merged commit 388076f into NixOS:master Aug 10, 2020
@jtojnar jtojnar mentioned this pull request Aug 11, 2020
Merged
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 5, 2021
@nh2
nixpkgs: Update submodule:
d759e3d 
* include fixes for GHC segfaulting: (NixOS/nixpkgs#129247, NixOS/nixpkgs#129289)
* musl 1.2.2, including this important fix from musl 1.2.0:
  #98 (comment)
* workaround for fontforge execution failure due to wrong RPATH:
  NixOS/nixpkgs#94126
* ilmbase musl compilation error:
  NixOS/nixpkgs#94205
* mesa: Fix `-Werror=int-conversion` build error on musl:
  NixOS/nixpkgs#94207
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 6, 2021
@nh2
nixpkgs: Update submodule:
eb2a627 
* include fixes for GHC segfaulting: (NixOS/nixpkgs#129247, NixOS/nixpkgs#129289)
* musl 1.2.2, including this important fix from musl 1.2.0:
  #98 (comment)
* workaround for fontforge execution failure due to wrong RPATH:
  NixOS/nixpkgs#94126
* ilmbase musl compilation error:
  NixOS/nixpkgs#94205
* mesa: Fix `-Werror=int-conversion` build error on musl:
  NixOS/nixpkgs#94207

survey:

* Update file in which stackage packages are listed.
  See nixpkgs commit

      7f236bd4 - hackage2nix: Split configuration, auto disable hydra builds
nh2 added a commit to nh2/static-haskell-nix that referenced this pull request Jul 20, 2021
@nh2
nixpkgs: Update submodule:
e75cff5 
* include fixes for GHC segfaulting: (NixOS/nixpkgs#129247, NixOS/nixpkgs#129289)
* musl 1.2.2, including this important fix from musl 1.2.0:
  #98 (comment)
* workaround for fontforge execution failure due to wrong RPATH:
  NixOS/nixpkgs#94126
* ilmbase musl compilation error:
  NixOS/nixpkgs#94205
* mesa: Fix `-Werror=int-conversion` build error on musl:
  NixOS/nixpkgs#94207

survey:

* Update file in which stackage packages are listed.
  See nixpkgs commit

      7f236bd4 - hackage2nix: Split configuration, auto disable hydra builds
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@risicle risicle risicle left review comments

@dtzWill dtzWill Awaiting requested review from dtzWill

Assignees

@nh2 nh2

Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nh2 @risicle