[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Fri Apr 4 15:51:04 MDT 2014


The branch, master has been updated
       via  e1df75b5 talloc: Update flags in pytalloc-util pkgconfig file
       via  a83c524 tevent: Update flags in tevent pkgconfig file
      from  5f8f1be s3-kerberos: make ipv6 support for generated krb5 config files more robust.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e1df75b5a965829db0c1f76673dcc824447b3ae7
Author: Lukas Slebodnik <lslebodn at redhat.com>
Date:   Fri Apr 4 13:29:39 2014 +0200

    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>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Fri Apr  4 23:50:25 CEST 2014 on sn-devel-104

commit a83c5240b1332d5a97dd21ecd3666a9c2ff38643
Author: Lukas Slebodnik <lslebodn at redhat.com>
Date:   Fri Apr 4 13:27:35 2014 +0200

    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>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 lib/talloc/pytalloc-util.pc.in |    4 ++--
 lib/tevent/tevent.pc.in        |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/pytalloc-util.pc.in b/lib/talloc/pytalloc-util.pc.in
index bc704b4..b7426bb 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/
diff --git a/lib/tevent/tevent.pc.in b/lib/tevent/tevent.pc.in
index 1091ff0..eb0e564 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/


-- 
Samba Shared Repository


More information about the samba-cvs mailing list