2020-04-19 08:04:44

by Eli Schwartz

[permalink] [raw]
Subject: [PATCH] pkg-config: use the correct replacements for libdir/includedir

They are defined pkg-config variables for a reason, let's reuse them as
is the intended usage of pkg-config. This ensures various pkg-config
features continue to work as expected.

Signed-off-by: Eli Schwartz <[email protected]>
---
libtirpc.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libtirpc.pc.in b/libtirpc.pc.in
index 38034c5..863950f 100644
--- a/libtirpc.pc.in
+++ b/libtirpc.pc.in
@@ -9,4 +9,4 @@ Requires:
Version: @PACKAGE_VERSION@
Libs: -L@libdir@ -ltirpc
Libs.private: -lpthread
-Cflags: -I@includedir@/tirpc
+Cflags: -I${includedir}/tirpc
--
2.26.0


2020-04-20 17:48:23

by Steve Dickson

[permalink] [raw]
Subject: Re: [Libtirpc-devel] [PATCH] pkg-config: use the correct replacements for libdir/includedir

Hello,

On 4/19/20 3:52 AM, Eli Schwartz wrote:
> They are defined pkg-config variables for a reason, let's reuse them as
> is the intended usage of pkg-config. This ensures various pkg-config
> features continue to work as expected.
Just curious... What pkg-config feature does this fix?

steved.

>
> Signed-off-by: Eli Schwartz <[email protected]>
> ---
> libtirpc.pc.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libtirpc.pc.in b/libtirpc.pc.in
> index 38034c5..863950f 100644
> --- a/libtirpc.pc.in
> +++ b/libtirpc.pc.in
> @@ -9,4 +9,4 @@ Requires:
> Version: @PACKAGE_VERSION@
> Libs: -L@libdir@ -ltirpc
> Libs.private: -lpthread
> -Cflags: -I@includedir@/tirpc
> +Cflags: -I${includedir}/tirpc
>

2020-04-20 18:24:48

by Eli Schwartz

[permalink] [raw]
Subject: Re: [Libtirpc-devel] [PATCH] pkg-config: use the correct replacements for libdir/includedir

On 4/20/20 1:47 PM, Steve Dickson wrote:
> Hello,
>
> On 4/19/20 3:52 AM, Eli Schwartz wrote:
>> They are defined pkg-config variables for a reason, let's reuse them as
>> is the intended usage of pkg-config. This ensures various pkg-config
>> features continue to work as expected.
> Just curious... What pkg-config feature does this fix?

--define-variable might be used to remap paths.

But I see I forgot to git add -p all changes. :(

--
Eli Schwartz
Arch Linux Bug Wrangler and Trusted User

Attachments:
signature.asc (1.59 kB)
OpenPGP digital signature

2020-04-20 18:27:29

by Eli Schwartz

[permalink] [raw]
Subject: [PATCH v2] pkg-config: use the correct replacements for libdir/includedir

They are defined pkg-config variables for a reason, let's reuse them as
is the intended usage of pkg-config. This ensures various pkg-config
features continue to work as expected.

Signed-off-by: Eli Schwartz <[email protected]>
---

v2: forgot the Libs change

libtirpc.pc.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libtirpc.pc.in b/libtirpc.pc.in
index 38034c5..d2c7878 100644
--- a/libtirpc.pc.in
+++ b/libtirpc.pc.in
@@ -7,6 +7,6 @@ Name: libtirpc
Description: Transport Independent RPC Library
Requires:
Version: @PACKAGE_VERSION@
-Libs: -L@libdir@ -ltirpc
+Libs: -L${libdir} -ltirpc
Libs.private: -lpthread
-Cflags: -I@includedir@/tirpc
+Cflags: -I${includedir}/tirpc
--
2.26.1

2020-04-27 14:16:06

by Steve Dickson

[permalink] [raw]
Subject: Re: [Libtirpc-devel] [PATCH v2] pkg-config: use the correct replacements for libdir/includedir



On 4/20/20 2:26 PM, Eli Schwartz wrote:
> They are defined pkg-config variables for a reason, let's reuse them as
> is the intended usage of pkg-config. This ensures various pkg-config
> features continue to work as expected.
>
> Signed-off-by: Eli Schwartz <[email protected]>
Committed... (tag: libtirpc-1-2-7-rc1)

steved.
> ---
>
> v2: forgot the Libs change
>
> libtirpc.pc.in | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libtirpc.pc.in b/libtirpc.pc.in
> index 38034c5..d2c7878 100644
> --- a/libtirpc.pc.in
> +++ b/libtirpc.pc.in
> @@ -7,6 +7,6 @@ Name: libtirpc
> Description: Transport Independent RPC Library
> Requires:
> Version: @PACKAGE_VERSION@
> -Libs: -L@libdir@ -ltirpc
> +Libs: -L${libdir} -ltirpc
> Libs.private: -lpthread
> -Cflags: -I@includedir@/tirpc
> +Cflags: -I${includedir}/tirpc
>