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

Clean up ignition-tools.pc file #40

Merged
merged 5 commits into from
Mar 22, 2021

Conversation

scpeters
Copy link
Member

🦟 Bug fix

Fixes minor problem introduced by #30

Summary

We merged #30 to make our cmake and .pc config files relocatable. That PR was merged before we noticed an issue in a similar PR: gazebosim/gz-cmake#129. The problem is the hard-coded ../.. path to prefix from pcfiledir is incorrect when the .pc file is installed to a subfolder of lib, such as for Ubuntu debian packages on amd64, which install to /usr/lib/x86_64-linux-gnu/pkgconfig. This PR includes the fix that was used for ign-cmake.

I also noticed that we have include and linker flags for this package in the .pc file even though it has no libraries or header files. So I've removed those files as well. Of course, now the .pc file is basically a no-op, but I'd rather have the correct relocatable path logic even if it's not used.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge

The hard-coded ../.. path to prefix is incorrect when the .pc file
is installed to a subfolder of lib, such as for debian packages,
which install to /usr/lib/x86_64-linux-gnu/pkgconfig

Signed-off-by: Steve Peters <[email protected]>
@scpeters scpeters requested a review from caguero as a code owner February 25, 2021 01:52
@github-actions github-actions bot added 🏢 edifice Ignition Edifice 🏰 citadel Ignition Citadel 🔮 dome Ignition Dome labels Feb 25, 2021
cmake/pkgconfig/ignition.in Outdated Show resolved Hide resolved
@chapulina chapulina requested a review from j-rivero March 1, 2021 19:36
@chapulina chapulina added the beta Targeting beta release of upcoming collection label Mar 17, 2021
@j-rivero j-rivero self-requested a review March 22, 2021 18:35
@j-rivero
Copy link
Contributor

A side comment: having a .pc with no information about compilation is quite weird. A signal that we want rethink somehow what are doing with it and how because there are probably better alternatives.

@scpeters
Copy link
Member Author

A side comment: having a .pc with no information about compilation is quite weird. A signal that we want rethink somehow what are doing with it and how because there are probably better alternatives.

other packages may list it as Required, in which case we need a file for them to find, even if it is empty

@scpeters scpeters merged commit 8b7352c into gazebosim:ign-tools1 Mar 22, 2021
@scpeters scpeters deleted the fix_relocatable_pkgconfig branch March 22, 2021 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta Targeting beta release of upcoming collection 🏰 citadel Ignition Citadel 🔮 dome Ignition Dome 🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants