Fix canterp.so installation#2299
Merged
SebKuzminsky merged 1 commit intoLinuxCNC:masterfrom Jan 25, 2023
Merged
Conversation
Fixes installation of canterp.so (introduced in c540432). Building rpm packages fails as follows: error: Installed (but unpackaged) file(s) found: /usr/lib64/linuxcnc This is a result of mismatch between - creating directories using: $(DESTDIR)/lib/linuxcnc - installing canterp.so using: $(FILE) ../lib/linuxcnc/canterp.so $(DESTDIR)$(libdir)/linuxcnc It is manifested on systems where "${libdir}" differs from "lib". Note: this does not fixes loading canterp.so which uses hardcoded path[1]. [1] LinuxCNC@1f733eb#diff-e4daea21a6d335db374a201d7386d70ef7ba440ee0d87aa462c87a051be68cffR39 Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
Collaborator
|
Thanks for the fix! |
Contributor
Author
I'm not sure what was the reason, but I'm observing that this PR was silently reverted by 1c9e07e. Was there something wrong with my patch? cc: @c-morley |
Collaborator
|
Master was accidentally merged to 2.9so we reverted it. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes installation of canterp.so (introduced in
c540432).
Building rpm packages fails as follows:
error: Installed (but unpackaged) file(s) found:
/usr/lib64/linuxcnc
This is a result of mismatch between
creating directories using: $(DESTDIR)/lib/linuxcnc
installing canterp.so using:$(FILE) ../lib/linuxcnc/canterp.so $ (DESTDIR)$(libdir)/linuxcnc
It manifests on systems where "${libdir}" differs from "lib".
Note: this does not fixes loading canterp.so which uses hardcoded path[1].
[1] 1f733eb#diff-e4daea21a6d335db374a201d7386d70ef7ba440ee0d87aa462c87a051be68cffR39
Signed-off-by: Damian Wrobel dwrobel@ertelnet.rybnik.pl