[libgnome-keyring] Fix the build

Kalev Lember kalev at fedoraproject.org
Wed Apr 18 13:19:51 UTC 2012


commit 13a79be1dab3659335b8dfcf3944fb7789360be8
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Apr 18 12:37:48 2012 +0300

    Fix the build
    
    ... by dropping the downstream libtool sed hack for removing rpaths.
    This was causing the introspection scanner to pick up system libs
    ('libgnome-keyring.so.0: cannot open shared object file')
    instead of the ones within the build tree.
    
    Apparently the libtool in current libgnome-keyring tarball doesn't add any
    lib64 rpaths, so we should be fine without the libtool hack.

 libgnome-keyring.spec |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/libgnome-keyring.spec b/libgnome-keyring.spec
index aa9d241..61ee232 100644
--- a/libgnome-keyring.spec
+++ b/libgnome-keyring.spec
@@ -45,8 +45,6 @@ header files needed to develop applications that use libgnome-keyring.
 
 %build
 %configure --disable-gtk-doc --enable-introspection=yes
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 # avoid unneeded direct dependencies
 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool


More information about the scm-commits mailing list