Attachment 937298 Details for Bug 1103162 – Patch fixing rpath in binaries.

[patch] Patch fixing rpath in binaries.

mirall-1.7.0-beta1-rpath.patch (text/plain), 1.47 KB, created by Dams on 2014-09-14 09:53:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dams

Created: 2014-09-14 09:53:29 UTC

Size: 1.47 KB

patch

obsolete

>diff -u --exclude CVS --exclude .svn --exclude .bzr -r mirall-1.7.0-beta1.orig/src/CMakeLists.txt mirall-1.7.0-beta1/src/CMakeLists.txt
>--- mirall-1.7.0-beta1.orig/src/CMakeLists.txt	2014-08-22 07:25:19.000000000 +0200
>+++ mirall-1.7.0-beta1/src/CMakeLists.txt	2014-09-13 15:59:24.805022448 +0200
>@@ -183,7 +183,7 @@
> 	SOVERSION ${MIRALL_SOVERSION}
> )
> set_target_properties( ${synclib_NAME} PROPERTIES
>-	INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
>+	INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
> 
> target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} )
> 
>@@ -388,7 +388,7 @@
>           RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY}
>   )
>   set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
>-	  INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
>+	  INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
> 
>   target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
>   target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
>@@ -434,7 +434,7 @@
> 	set_target_properties(${owncloudcmd_NAME} PROPERTIES
> 	        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
>         set_target_properties(${owncloudcmd_NAME} PROPERTIES
>-		INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
>+		INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
> 
> 	target_link_libraries(${owncloudcmd_NAME} ${synclib_NAME})
> endif()

Actions: View | Diff

Attachments on bug 1103162: 937297 | 937298 | 937299 | 945095