Add pkg-config support #47
Closed
Conversation
This file contains 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
Closed
|
This has several problems in the "Determine some more variables at configure time" commit.
|
Namely LIBDIR, INCDIR and VERSION. Prefix paths with INSTROOT when installing. This is not very useful as is, but will make substituting the variables onto the pkg-config .pc file at configure time possible. Moreover, it will be easier for distributors which use multilib to override LIBDIR on 64-bit systems. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Rename ${DESTDIR} to ${prefix} and only let make expand it. This is
basically analogous to what autotools do. It will be useful for generating a
proper pkg-config file (where the prefix is called ${prefix} and is expected to
be unexpanded).
DESTDIR name was used inconsistently with what the rest of the world
does (where it modifies the installation prefix, sort of what our
${INSTROOT} does).
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
This makes it convenient for external plugins to determine path to install into. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
|
Thanks. Addressed the review. I've also added one more change. That one is required so that the .pc file is "relocatable" -- the prefix is expanded later and thus can be overridden. That is useful when whoever consumes the file chooses an alternate installation prefix after the build is done (e.g. what autotools' "make distcheck" does when checking sanity of the installation). |
|
@lkundrak: Can you rebase your PR? |
|
I'd also vouch for this as maintenance of network-manager-sstp and sstp-client would be easier. |
|
@enaess: I think the best solution, badly, is to create a new PR... :/ |
|
@Neustradamus I'll have a look |
enaess
added a commit
to enaess/ppp
that referenced
this pull request
Apr 15, 2021
This adds pppd.pc into $(INSTROOT)/$(LIBDIR)/pkgconfig. On some distributions this would be /lib/pkgconfig, or /usr/lib/pkgconfig, but other distributions may consider specifying --libdir=/usr/lib/x86_x64-linux-gnu/ and the pkgconfig directory would be under that. Allowing --libdir to be specified at configure time fixes ppp-project#223, providing pkgconfig support fixes ppp-project#19 and allows third party packages pickup the plugin directory. Manually cherry picking parts of two commits by @lkundrak from: https://github.com/NetworkManager/ppp/tree/lr/pkgconfig Mainly, the difference between the original commit is not to replace DESTDIR with "prefix". Leave DESTDIR alone, and add needed pkgconfig (pppd.pc.in) as a part of the linux distribution (previously in pppd/plugin directory). This fixes GitHub issues: ppp-project#19 ppp-project#47 and ppp-project#223 Signed-off-by: Eivind Naess <eivnaes@yahoo.com>
paulusmack
pushed a commit
that referenced
this pull request
Apr 24, 2021
This adds pppd.pc into $(INSTROOT)/$(LIBDIR)/pkgconfig. On some distributions this would be /lib/pkgconfig, or /usr/lib/pkgconfig, but other distributions may consider specifying --libdir=/usr/lib/x86_x64-linux-gnu/ and the pkgconfig directory would be under that. Allowing --libdir to be specified at configure time fixes #223, providing pkgconfig support fixes #19 and allows third party packages pickup the plugin directory. Manually cherry picking parts of two commits by @lkundrak from: https://github.com/NetworkManager/ppp/tree/lr/pkgconfig Mainly, the difference between the original commit is not to replace DESTDIR with "prefix". Leave DESTDIR alone, and add needed pkgconfig (pppd.pc.in) as a part of the linux distribution (previously in pppd/plugin directory). This fixes GitHub issues: #19 #47 and #223 Signed-off-by: Eivind Naess <eivnaes@yahoo.com>
|
Hello, should this PR be closed now that pkg-config has been merged ? c.f. #270 |
|
@lkundrak @paulusmack could you please close this PR? |
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.
Hii,
plese review this and consider merging it. It will make it simpler for us to determine the location where to put the NetworkManger pppd plugin.
Thank you!
Lubo