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

Fix building for "Linux Process" in non-FHS environments #6493

Merged
merged 2 commits into from
Apr 4, 2024

Conversation

MadnessASAP
Copy link
Contributor

This PR addresses building the Klipper "Linux Process" MCU on filesystem layouts that don't adhere to the FHS standard (i.e. NixOS) . It replaces the absolute include paths in main.c and gpio.c with relative paths. It also adjusts CFLAGS to use -iquote to prevent conflicts when resolving quoted "includes" and .

The finest of "builds for me" testing was carried out successfully.

@CRTified
Copy link
Contributor

Thanks, I just looked into setting up the host MCU and ran into this issue. This PR fixed compilation for me :)

@MadnessASAP
Copy link
Contributor Author

Thanks, I just looked into setting up the host MCU and ran into this issue. This PR fixed compilation for me :)

Glad it helped, are you also running on NixOS by chance? I'm also putting some TLC into the nixpkg module.

@CRTified
Copy link
Contributor

are you also running on NixOS by chance?

Yes, I am. Feel free to ping me on matrix (@CRTified:crtified.me), I got the host mcu working on NixOS already :)

Copy link

github-actions bot commented Mar 7, 2024

Thank you for your contribution to Klipper. Unfortunately, a reviewer has not assigned themselves to this GitHub Pull Request. All Pull Requests are reviewed before merging, and a reviewer will need to volunteer. Further information is available at: https://www.klipper3d.org/CONTRIBUTING.html

There are some steps that you can take now:

  1. Perform a self-review of your Pull Request by following the steps at: https://www.klipper3d.org/CONTRIBUTING.html#what-to-expect-in-a-review
    If you have completed a self-review, be sure to state the results of that self-review explicitly in the Pull Request comments. A reviewer is more likely to participate if the bulk of a review has already been completed.
  2. Consider opening a topic on the Klipper Discourse server to discuss this work. The Discourse server is a good place to discuss development ideas and to engage users interested in testing. Reviewers are more likely to prioritize Pull Requests with an active community of users.
  3. Consider helping out reviewers by reviewing other Klipper Pull Requests. Taking the time to perform a careful and detailed review of others work is appreciated. Regular contributors are more likely to prioritize the contributions of other regular contributors.

Unfortunately, if a reviewer does not assign themselves to this GitHub Pull Request then it will be automatically closed. If this happens, then it is a good idea to move further discussion to the Klipper Discourse server. Reviewers can reach out on that forum to let you know if they are interested and when they are available.

Best regards,
~ Your friendly GitIssueBot

PS: I'm just an automated script, not a human being.

@cnf
Copy link

cnf commented Mar 27, 2024

Discord Link to a discussion about this.

@KevinOConnor
Copy link
Collaborator

Thanks. It seems fine to me. Could you split the line in the Makefile so it does not exceed 80 characters though?

-Kevin

@KevinOConnor KevinOConnor added the pending feedback Topic is pending feedback from submitter label Apr 3, 2024
The -iquote tells GCC to only search that path when resolving a quoted
"include" (vs <angle brackets>) which by convention imples a include from
the projects own soruce tree. This prevents a conflict between Klippers
"sched.h" and "gpio.h" and <linux/gpio.h> and glibc <sched.h>.

Signed-off-by: Michael 'ASAP' Weinrich <michael@a5ap.net>
Not all systems (i.e. Nix) repect the standard Linux filesystem hierarchy,
instead relative paths should be used and allowing GCC to rely on it's
builtin search paths.

Signed-off-by: Michael 'ASAP' Weinrich <michael@a5ap.net>
@MadnessASAP
Copy link
Contributor Author

Thanks! Makefile corrected for the non-ultrawide proletariat.

@KevinOConnor KevinOConnor merged commit 6f16e11 into Klipper3d:master Apr 4, 2024
1 check passed
@KevinOConnor
Copy link
Collaborator

Thanks.

-Kevin

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pending feedback Topic is pending feedback from submitter reviewer needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants