[debian-edu-commits] debian-edu/ 05/32: debian/patches: Update 001_set-static-libdir-and-rpath-for-cmake.patch. Adapt block that hard-sets LIB_DIR to /usr/lib/italc.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to annotated tag debian/1_2.0.2+dfsg1-1
in repository italc.

commit f16d66f03829fce5ebc00f2b15314631132a6de9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Aug 14 11:26:51 2014 +0200

    debian/patches: Update 001_set-static-libdir-and-rpath-for-cmake.patch. Adapt block that hard-sets LIB_DIR to /usr/lib/italc.
---
 ...001_set-static-libdir-and-rpath-for-cmake.patch | 34 ++++++++++------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/debian/patches/001_set-static-libdir-and-rpath-for-cmake.patch b/debian/patches/001_set-static-libdir-and-rpath-for-cmake.patch
index 36ccaa8..ba5f532 100644
--- a/debian/patches/001_set-static-libdir-and-rpath-for-cmake.patch
+++ b/debian/patches/001_set-static-libdir-and-rpath-for-cmake.patch
@@ -6,24 +6,7 @@ Description: libItalcCore library path
     this to a share library location
 Forwarded: Debian-specific
 Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Last-Update: 2012-05-18
---- a/cmake/modules/DetectMachine.cmake
-+++ b/cmake/modules/DetectMachine.cmake
-@@ -32,13 +32,5 @@
- 	MESSAGE("Can't identify target host. Assuming 32 bit platform.")
- ENDIF(IS_X86)
- 
--IF(CMAKE_INSTALL_LIBDIR)
--    SET(LIB_DIR "${CMAKE_INSTALL_LIBDIR}")
--ELSE(CMAKE_INSTALL_LIBDIR)
--    IF(ITALC_HOST_X86_64)
--        SET(LIB_DIR lib64)
--    ELSE(ITALC_HOST_X86_64)
--        SET(LIB_DIR lib)
--    ENDIF(ITALC_HOST_X86_64)
--ENDIF(CMAKE_INSTALL_LIBDIR)
-+SET(LIB_DIR lib/italc)
- 
+Last-Update: 2014-08-14
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -2,6 +2,18 @@
@@ -32,7 +15,7 @@ Last-Update: 2012-05-18
  
 +# make sure that the binaries of iTALC find their (in Debian) private/unversioned library libItalcCore.so
 +SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
-+SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
++SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 +SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/italc")
 +SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 +
@@ -45,3 +28,16 @@ Last-Update: 2012-05-18
  SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
  SET(CMAKE_BUILD_TYPE relwithdebinfo)
  
+--- a/cmake/modules/DetectMachine.cmake
++++ b/cmake/modules/DetectMachine.cmake
+@@ -32,9 +32,5 @@
+ 	MESSAGE("Can't identify target host. Assuming 32 bit platform.")
+ ENDIF(IS_X86)
+ 
+-IF(CMAKE_INSTALL_LIBDIR)
+-    SET(LIB_DIR "${CMAKE_INSTALL_LIBDIR}")
+-ELSE(CMAKE_INSTALL_LIBDIR)
+-	SET(LIB_DIR lib)
+-ENDIF(CMAKE_INSTALL_LIBDIR)
++SET(LIB_DIR "/usr/lib/italc/")
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/italc.git