[caffe] 04/04: patch: cmake-octave-fix-library

[Zhou Mo]

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

cdluminate-guest pushed a commit to branch master
in repository caffe.

commit 2e1e8ddc473f9c6fd8b9e21d8157a931ad7a30d2
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Thu Jun 30 16:14:02 2016 +0000

    patch: cmake-octave-fix-library
---
 debian/patches/cmake-octave-fix-library | 25 +++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/cmake-octave-fix-library b/debian/patches/cmake-octave-fix-library
new file mode 100644
index 0000000..a485d76
--- /dev/null
+++ b/debian/patches/cmake-octave-fix-library
@@ -0,0 +1,25 @@
+Temporary hack for mkoctfile to file correct python3 lib
+
+Forward: no, keep it here
+--- a/matlab/CMakeLists.txt
++++ b/matlab/CMakeLists.txt
+@@ -42,6 +42,10 @@
+ string(REPLACE ";" ";-L" link_folders "-L${folders}")
+ string(REPLACE ";" ":"  rpath_folders   "${folders}")
+ 
++# [for Debian] Temporary hack so it won't fail
++string(REPLACE "python3" "python3.5m" libflags "${libflags}")
++string(REPLACE "-fPIE" "" cflags_octave "${cflags}")
++
+ if(build_using MATCHES "Matlab")
+   set(libflags -lcaffe${Caffe_POSTFIX} ${libflags}) # Matlab R2014a complans for -Wl,--whole-archive
+ 
+@@ -60,7 +64,7 @@
+   endif()
+ 
+   add_custom_command(OUTPUT ${Matlab_caffe_mex} COMMAND ${Octave_compiler}
+-      ARGS --mex -o ${Matlab_caffe_mex} ${Matlab_srcs} ${cflags} ${link_folders} ${libflags} -Wl,-rpath,${rpath_folders}
++      ARGS --mex -v -o ${Matlab_caffe_mex} ${Matlab_srcs} ${cflags_octave} ${link_folders} ${libflags} -Wl,-rpath,${rpath_folders}
+       DEPENDS caffe COMMENT "Building Octave interface: ${Matlab_caffe_mex}" VERBATIM)
+ 
+   add_custom_target(octave ALL DEPENDS ${Matlab_caffe_mex} SOURCES ${Matlab_srcs})
diff --git a/debian/patches/series b/debian/patches/series
index ddc613e..d66d554 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ cmake-using-basic-blas
 cmake-using-gnuinstalldirs
 fix-spelling-error
 cmake-fix-python-module-installdir
+cmake-octave-fix-library

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