[phonon] reset no_rpath patch to omit all the RPATH baggage, since this actually gets installed as a cmake mo

Rex Dieter rdieter at fedoraproject.org
Fri Jan 21 15:04:36 UTC 2011


commit a759d2056d337f689b44817c1a2be3df490d6e2f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jan 21 09:03:13 2011 -0600

    reset no_rpath patch to omit all the RPATH baggage, since
    this actually gets installed as a cmake module

 phonon-4.4.4-no_rpath.patch |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/phonon-4.4.4-no_rpath.patch b/phonon-4.4.4-no_rpath.patch
index 586b71c..36110f7 100644
--- a/phonon-4.4.4-no_rpath.patch
+++ b/phonon-4.4.4-no_rpath.patch
@@ -1,12 +1,14 @@
 diff -up phonon-4.4.4/cmake/FindPhononInternal.cmake.no_rpath phonon-4.4.4/cmake/FindPhononInternal.cmake
 --- phonon-4.4.4/cmake/FindPhononInternal.cmake.no_rpath	2011-01-19 13:20:00.000000000 -0600
-+++ phonon-4.4.4/cmake/FindPhononInternal.cmake	2011-01-21 07:55:03.464702040 -0600
-@@ -232,7 +232,7 @@ endif(APPLE)
++++ phonon-4.4.4/cmake/FindPhononInternal.cmake	2011-01-21 09:02:08.242131811 -0600
+@@ -232,8 +232,8 @@ endif(APPLE)
  # These two options below make it set the RPATH of the installed targets to all
  # RPATH directories outside the current CMAKE_BINARY_DIR and also the library 
  # install directory. Alex
 -set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
-+#set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  FALSE)
- set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
+-set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
++#set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
++#set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
  
  
+ # Uninstall Target


More information about the scm-commits mailing list