jreznik pushed to kdelibs3 (epel7). "rpath: hack on libtool"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 2 15:40:07 UTC 2015


>From 04a6e0d84bd893fd85789938b3705aa31db0e263 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 13 Aug 2014 12:45:47 -0500
Subject: rpath: hack on libtool


diff --git a/kdelibs3.spec b/kdelibs3.spec
index 52689d0..2477cae 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -317,9 +317,9 @@ export DO_NOT_COMPILE="libkscreensaver"
    --with-openexr \
    --with-xinerama
 
-# kill rpath harder, https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines#Removing_Rpath
-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
+# kill rpath harder, inspired by https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines#Removing_Rpath
+# other more standard variants didnt work or caused other problems
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' libtool
 
 %if 0%{?apidocs}
   doxygen -s -u admin/Doxyfile.global
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=04a6e0d84bd893fd85789938b3705aa31db0e263


More information about the scm-commits mailing list