rpms/kdelibs/devel kdelibs-4.4.80-no_rpath.patch,1.1,1.2

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9668

Modified Files:
	kdelibs-4.4.80-no_rpath.patch 
Log Message:
keep only CMAKE_INSTALL_RPATH_USE_LINK_PATH part of the patch for now,
the rest is most likely no longer needed (will verify once we have some
initial builds to test)


kdelibs-4.4.80-no_rpath.patch:
 FindKDE4Internal.cmake |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Index: kdelibs-4.4.80-no_rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-4.4.80-no_rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdelibs-4.4.80-no_rpath.patch	21 May 2010 08:28:43 -0000	1.1
+++ kdelibs-4.4.80-no_rpath.patch	21 May 2010 12:24:24 -0000	1.2
@@ -6,15 +6,15 @@ diff -up kdelibs-4.4.80/cmake/modules/Fi
        list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemLibDir)
        if("${_isSystemLibDir}" STREQUAL "-1")
 -         set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
-+         # set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
-+         message(STATUS "CMAKE_SYSTEM_LIBRARY_PATH: ${CMAKE_SYSTEM_LIBRARY_PATH}")
-+         message(STATUS "LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}")
-+         list(FIND CMAKE_SYSTEM_LIBRARY_PATH ${LIB_INSTALL_DIR} _LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH)
-+         message(STATUS "_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH: ${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH}")
-+         if(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
-+            message(STATUS "appending to CMAKE_INSTALL_RPATH: ${LIB_INSTALL_DIR}")
-+            list(APPEND CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR})
-+         endif(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
++         set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
++         #message(STATUS "CMAKE_SYSTEM_LIBRARY_PATH: ${CMAKE_SYSTEM_LIBRARY_PATH}")
++         #message(STATUS "LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}")
++         #list(FIND CMAKE_SYSTEM_LIBRARY_PATH ${LIB_INSTALL_DIR} _LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH)
++         #message(STATUS "_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH: ${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH}")
++         #if(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
++         #   message(STATUS "appending to CMAKE_INSTALL_RPATH: ${LIB_INSTALL_DIR}")
++         #   list(APPEND CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR})
++         #endif(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
        endif("${_isSystemLibDir}" STREQUAL "-1")
  
        set(CMAKE_SKIP_BUILD_RPATH FALSE)