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

libclc: fix libclc.pc file #153954

Merged
merged 1 commit into from
Feb 17, 2022
Merged

libclc: fix libclc.pc file #153954

merged 1 commit into from
Feb 17, 2022

Conversation

kotatsuyaki
Copy link
Contributor

@kotatsuyaki kotatsuyaki commented Jan 8, 2022

Closes #152060

Apply the same fix as in #81091. See also the tracking issue #144170.

Motivation for this change

The wrong include path in the pkgconfig script caused OpenCL kernel compile failing with mesa (see #152060).

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • 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/)
  • 22.05 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@r-burns
Copy link
Contributor

r-burns commented Feb 4, 2022

I opened an upstream revision for this, which may be a cleaner fix: https://reviews.llvm.org/D118959

This looks like a reasonable workaround to me. Please target the staging branch due to the high rebuild count.

@kotatsuyaki kotatsuyaki changed the base branch from master to staging February 4, 2022 08:38
Copy link
Contributor

@r-burns r-burns left a comment

Choose a reason for hiding this comment

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

LGTM

@r-burns r-burns merged commit ce7e311 into NixOS:staging Feb 17, 2022
@r-burns r-burns mentioned this pull request Jun 3, 2023
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OpenCL error with mesa
2 participants