← Back to branch summary

~ubuntu-branches/ubuntu/natty/phonon/natty

« back to all changes in this revision

Viewing changes to debian/patches/02_no_rpath.patch

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2011-01-24 10:12:11 UTC
  • mfrom: (0.5.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110124101211-w9rew7q0dmwbwhqx
Tags: 4:4.7.0really4.4.4-0ubuntu1
* New upstream release
* Xine and GStreamer backends now split out source, remove build-deps and
  binary packages from debian/control
* Remove 02_no_rpath.patch, now upstream
* Disable kubuntu04_no_va_mangle.patch, no longer applies
* Remove kubuntu_05_gst_codec_installer_window_id.diff, kubuntu_06_forward_events.diff,
  kubuntu_07_include_fix.diff, gstreamer now separate

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_no_rpath.patch
1
 
From: Modestas Vainius <modax@debian.org>
2
 
Subject: Do not set install RPATH to /usr/lib by default
3
 
 /usr/lib RPATH is disallowed on Debian systems and is a bad practise in
4
 
 general
5
 
Forwarded: not-needed
6
 
--- a/CMakeLists.txt
7
 
+++ b/CMakeLists.txt
8
 
@@ -244,15 +244,6 @@ if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_
9
 
    set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common")
10
 
 endif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc")
11
 
 
12
 
-# Set up RPATH handling, so the libs are found if they are installed to a non-standard location.
13
 
-# By default cmake builds the targets with full RPATH to everything in the build directory,
14
 
-# but then removes the RPATH when installing.
15
 
-# These two options below make it set the RPATH of the installed targets to all
16
 
-# RPATH directories outside the current CMAKE_BINARY_DIR and also the library 
17
 
-# install directory. Alex
18
 
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
19
 
-set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}" )
20
 
-
21
 
 if(APPLE)
22
 
    set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
23
 
 endif(APPLE)