Skip to content

Fix canterp.so installation#2299

Merged
SebKuzminsky merged 1 commit intoLinuxCNC:masterfrom
dwrobel:Fix-canterp.so-installation
Jan 25, 2023
Merged

Fix canterp.so installation#2299
SebKuzminsky merged 1 commit intoLinuxCNC:masterfrom
dwrobel:Fix-canterp.so-installation

Conversation

@dwrobel
Copy link
Copy Markdown
Contributor

@dwrobel dwrobel commented Jan 25, 2023

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

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>
@SebKuzminsky SebKuzminsky merged commit 3074091 into LinuxCNC:master Jan 25, 2023
@SebKuzminsky
Copy link
Copy Markdown
Collaborator

Thanks for the fix!

@dwrobel
Copy link
Copy Markdown
Contributor Author

dwrobel commented Apr 4, 2023

Thanks for the fix!

$ git blame Makefile | grep lib\/linuxcnc\ 
1c9e07e187b src/Makefile (CMorley                 2023-03-31 18:33:23 -0700  670) 		$(DESTDIR)/lib/linuxcnc $(DESTDIR)$(includedir)/linuxcnc \

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?
Should I re-submit it, or maybe something was wrong with the revert?
BTW, I didn't check what else got reverted.

cc: @c-morley

@c-morley
Copy link
Copy Markdown
Collaborator

c-morley commented Apr 4, 2023

Master was accidentally merged to 2.9so we reverted it.
I'm sure more things got reverted too as I'm no git expert.
please submit your patch again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants