[lua-torch-nn] 07/07: patch: modify THNN-cmake-add-soversion

[Zhou Mo]

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

cdluminate-guest pushed a commit to branch master
in repository lua-torch-nn.

commit ddb6b452576995e4b97c158119cce4f00f9d8262
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Jan 11 06:50:42 2017 +0000

    patch: modify THNN-cmake-add-soversion
---
 debian/changelog                        |  1 +
 debian/patches/THNN-cmake-add-soversion | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 341186a..2956ff7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ lua-torch-nn (0~20170104-ge77b592+dfsg-1) UNRELEASED; urgency=medium
   * Bump debhelper compat to 10.
   * Remove patch: THNN-assume-torch-is-present . Use cmake flag
     `Torch_FOUND` in d/rules instead.
+  * Modify patch: THNN-cmake-add-soversion to adapt upstream change.
 
  -- Zhou Mo <cdluminate at gmail.com>  Tue, 10 Jan 2017 14:27:59 +0000
 
diff --git a/debian/patches/THNN-cmake-add-soversion b/debian/patches/THNN-cmake-add-soversion
index c0a3e40..6418443 100644
--- a/debian/patches/THNN-cmake-add-soversion
+++ b/debian/patches/THNN-cmake-add-soversion
@@ -1,8 +1,10 @@
-Add soversion for THNN
-Forward: yes. https://github.com/torch/nn/pull/927
+Purpose: tweak cmake build
+Forward: keep it here.
+diff --git a/lib/THNN/CMakeLists.txt b/lib/THNN/CMakeLists.txt
+index 33eaf56..1d13651 100644
 --- a/lib/THNN/CMakeLists.txt
 +++ b/lib/THNN/CMakeLists.txt
-@@ -54,12 +54,14 @@
+@@ -60,7 +60,7 @@ ENDIF (WITH_OPENMP)
  LINK_DIRECTORIES("${Torch_INSTALL_LIB}")
  
  SET(src init.c)
@@ -11,11 +13,12 @@ Forward: yes. https://github.com/torch/nn/pull/927
  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
  ### Torch packages supposes libraries prefix is "lib"
  SET_TARGET_PROPERTIES(THNN PROPERTIES
-   PREFIX "lib"
--  IMPORT_PREFIX "lib")
-+  IMPORT_PREFIX "lib"
-+  VERSION   0
-+  SOVERSION 0)
- TARGET_LINK_LIBRARIES(THNN TH)
+@@ -70,7 +70,7 @@ SET_TARGET_PROPERTIES(THNN PROPERTIES
+ TARGET_LINK_LIBRARIES(THNN ${TH_LIBRARIES})
  
- INSTALL(TARGETS THNN LIBRARY DESTINATION ${THNN_INSTALL_LIB_SUBDIR})
+ # Luarocks bug pre-14.04 prevents us from setting it for Lua-Torch
+-IF(THNN_SO_VERSION)
++IF(USE_THNN_SO_VERSION)
+   MESSAGE(STATUS "THNN_SO_VERSION: ${THNN_SO_VERSION}")
+   SET_TARGET_PROPERTIES(THNN PROPERTIES
+     VERSION   ${THNN_SO_VERSION}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/lua-torch-nn.git