[PATCH] pkgconfig: @LIB_RPATH@ should be in link flags

[Lukas Slebodnik]

On (04/04/14 12:17), Stefan (metze) Metzmacher wrote:
>Hi Lukas,
>
>can you please split the commit into two commits?
>
>Then it's fine for me.
>
>Thanks!
>metze
No problem.

new patches are attached.

LS
-------------- next part --------------
>From ce5db087bc3fe88276407234cdf17e95caec2b92 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Fri, 4 Apr 2014 13:27:35 +0200
Subject: [PATCH 1/2] tevent: Update flags in tevent pkgconfig file

After exapnding, @LIB_RPATH@ will be -Wl,-rpatch,/usr/local/lib if rpath is
used on install. But "-Wl," will be passed to linker and should not be among
CFLAGS. Other pkgconfig files have @LIB_RPATH@ in the right place.
    @see commit 735c1cd2da15167748e92ba6de48fdb5169db587

Signed-off-by: Lukas Slebodnik <lslebodn at redhat.com>
---
 lib/tevent/tevent.pc.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tevent/tevent.pc.in b/lib/tevent/tevent.pc.in
index 1091ff00f1e4d5e6562ee42556ca9984895069bf..eb0e564f7247007e53692c02f6d4dce0be62a160 100644
--- a/lib/tevent/tevent.pc.in
+++ b/lib/tevent/tevent.pc.in
@@ -7,6 +7,6 @@ Name: tevent
 Description: An event system library
 Version: @PACKAGE_VERSION@
 Requires: talloc
-Libs: -L${libdir} -ltevent
-Cflags: @LIB_RPATH@ -I${includedir}
+Libs: @LIB_RPATH@ -L${libdir} -ltevent
+Cflags: -I${includedir}
 URL: http://samba.org/
-- 
1.9.0

-------------- next part --------------
>From 512b85b881ff9ea6fd04ef0f4f978e0a3593ec1e Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Fri, 4 Apr 2014 13:29:39 +0200
Subject: [PATCH 2/2] talloc: Update flags in pytalloc-util pkgconfig file

After exapnding, @LIB_RPATH@ will be -Wl,-rpatch,/usr/local/lib if rpath is
used on install. But "-Wl," will be passed to linker and should not be among
CFLAGS. Other pkgconfig files have @LIB_RPATH@ in the right place.
    @see commit 735c1cd2da15167748e92ba6de48fdb5169db587

Signed-off-by: Lukas Slebodnik <lslebodn at redhat.com>
---
 lib/talloc/pytalloc-util.pc.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/talloc/pytalloc-util.pc.in b/lib/talloc/pytalloc-util.pc.in
index bc704b4929416977235a18d3f9d110358127a984..b7426bb1124d5c03af4b1351e1e1c55d039d6f82 100644
--- a/lib/talloc/pytalloc-util.pc.in
+++ b/lib/talloc/pytalloc-util.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: pytalloc-util
 Description: Utility functions for using talloc objects with Python
 Version: @TALLOC_VERSION@
-Libs: -L${libdir} -lpytalloc-util
-Cflags: @LIB_RPATH@ -I${includedir}
+Libs: @LIB_RPATH@ -L${libdir} -lpytalloc-util
+Cflags: -I${includedir}
 URL: http://talloc.samba.org/
-- 
1.9.0