[caffe] 21/249: Try: fix build failure

[Zhou Mo]

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

cdluminate-guest pushed a commit to branch debian/experimental
in repository caffe.

commit 21a8aa1d6b8459685e49a8ab9b9ae8eba2723fc9
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Thu Jul 9 02:18:31 2015 +0000

    Try: fix build failure
---
 .../patches/01-fix-makefile-rpath-and-soname.patch | 32 ++++++++++++----------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/debian/patches/01-fix-makefile-rpath-and-soname.patch b/debian/patches/01-fix-makefile-rpath-and-soname.patch
index 22ba3f5..ca1d614 100644
--- a/debian/patches/01-fix-makefile-rpath-and-soname.patch
+++ b/debian/patches/01-fix-makefile-rpath-and-soname.patch
@@ -33,13 +33,14 @@ Fix rpath issue in upstream Makefile
  $(PY$(PROJECT)_SO): $(PY$(PROJECT)_SRC) $(PY$(PROJECT)_HXX) | $(DYNAMIC_NAME)
  	@ echo CXX/LD -o $@ $<
 -	$(Q)$(CXX) -shared -o $@ $(PY$(PROJECT)_SRC) \
+-		-o $@ $(LINKFLAGS) -l$(PROJECT) $(PYTHON_LDFLAGS) \
+-		-Wl,-rpath,$(ORIGIN)/../../build/lib
 +	#$(Q)$(CXX) -shared -o $@ $(PY$(PROJECT)_SRC) \
 +	#	-o $@ $(LINKFLAGS) -l$(PROJECT) $(PYTHON_LDFLAGS) \
 +	#	-L$(ORIGIN)/$(LIB_BUILD_DIR)/
 +	echo "$(CXX) -shared -o $@ $(PY$(PROJECT)_SRC) \
- 		-o $@ $(LINKFLAGS) -l$(PROJECT) $(PYTHON_LDFLAGS) \
--		-Wl,-rpath,$(ORIGIN)/../../build/lib
-+		-L$(ORIGIN)/$(LIB_BUILD_DIR)/ " > build_py_so.sh
++		-o $@ $(LINKFLAGS) $(PYTHON_LDFLAGS) \
++		-L$(ORIGIN)/$(LIB_BUILD_DIR)/ -l:$(SONAME)" > build_py_so.sh
 +	sed -i -e 's/-pie//g' -e 's/-fPIE/-fPIE -fPIC/g' build_py_so.sh
 +	sh build_py_so.sh
 +	$(RM) build_py_so.sh
@@ -66,39 +67,42 @@ Fix rpath issue in upstream Makefile
  	@ echo CXX/LD -o $@ $<
  	$(Q)$(CXX) $(TEST_MAIN_SRC) $(TEST_OBJS) $(GTEST_OBJ) \
 -		-o $@ $(LINKFLAGS) $(LDFLAGS) -l$(PROJECT) -Wl,-rpath,$(ORIGIN)/../lib
-+		-o $@ $(LINKFLAGS) $(LDFLAGS) -l$(PROJECT) \
-+		-L$(ORIGIN)/$(LIB_BUILD_DIR)/
++		-o $@ $(LINKFLAGS) $(LDFLAGS)  \
++		-L$(ORIGIN)/$(LIB_BUILD_DIR)/ -l:$(SONAME)
  
  $(TEST_CU_BINS): $(TEST_BIN_DIR)/%.testbin: $(TEST_CU_BUILD_DIR)/%.o \
  	$(GTEST_OBJ) | $(DYNAMIC_NAME) $(TEST_BIN_DIR)
  	@ echo LD $<
  	$(Q)$(CXX) $(TEST_MAIN_SRC) $< $(GTEST_OBJ) \
 -		-o $@ $(LINKFLAGS) $(LDFLAGS) -l$(PROJECT) -Wl,-rpath,$(ORIGIN)/../lib
-+		-o $@ $(LINKFLAGS) $(LDFLAGS) -l$(PROJECT) \
-+		-L$(ORIGIN)/$(LIB_BUILD_DIR)/
++		-o $@ $(LINKFLAGS) $(LDFLAGS)  \
++		-L$(ORIGIN)/$(LIB_BUILD_DIR)/ -l:$(SONAME)
  
  $(TEST_CXX_BINS): $(TEST_BIN_DIR)/%.testbin: $(TEST_CXX_BUILD_DIR)/%.o \
  	$(GTEST_OBJ) | $(DYNAMIC_NAME) $(TEST_BIN_DIR)
  	@ echo LD $<
  	$(Q)$(CXX) $(TEST_MAIN_SRC) $< $(GTEST_OBJ) \
 -		-o $@ $(LINKFLAGS) $(LDFLAGS) -l$(PROJECT) -Wl,-rpath,$(ORIGIN)/../lib
-+		-o $@ $(LINKFLAGS) $(LDFLAGS) -l$(PROJECT) \
-+		-L$(ORIGIN)/$(LIB_BUILD_DIR)/
++		-o $@ $(LINKFLAGS) $(LDFLAGS)  \
++		-L$(ORIGIN)/$(LIB_BUILD_DIR)/ -l:$(SONAME)
  
  # Target for extension-less symlinks to tool binaries with extension '*.bin'.
  $(TOOL_BUILD_DIR)/%: $(TOOL_BUILD_DIR)/%.bin | $(TOOL_BUILD_DIR)
-@@ -559,12 +579,12 @@
+@@ -558,13 +578,13 @@
+ 
  $(TOOL_BINS): %.bin : %.o | $(DYNAMIC_NAME)
  	@ echo CXX/LD -o $@
- 	$(Q)$(CXX) $< -o $@ $(LINKFLAGS) -l$(PROJECT) $(LDFLAGS) \
+-	$(Q)$(CXX) $< -o $@ $(LINKFLAGS) -l$(PROJECT) $(LDFLAGS) \
 -		-Wl,-rpath,$(ORIGIN)/../lib
-+		-L$(ORIGIN)/$(LIB_BUILD_DIR)/
++	$(Q)$(CXX) $< -o $@ $(LINKFLAGS) $(LDFLAGS) \
++		-L$(ORIGIN)/$(LIB_BUILD_DIR)/ -l:$(SONAME)
  
  $(EXAMPLE_BINS): %.bin : %.o | $(DYNAMIC_NAME)
  	@ echo CXX/LD -o $@
- 	$(Q)$(CXX) $< -o $@ $(LINKFLAGS) -l$(PROJECT) $(LDFLAGS) \
+-	$(Q)$(CXX) $< -o $@ $(LINKFLAGS) -l$(PROJECT) $(LDFLAGS) \
 -		-Wl,-rpath,$(ORIGIN)/../../lib
-+		-L$(ORIGIN)/$(LIB_BUILD_DIR)/
++	$(Q)$(CXX) $< -o $@ $(LINKFLAGS) $(LDFLAGS) \
++		-L$(ORIGIN)/$(LIB_BUILD_DIR)/ -l:$(SONAME)
  
  proto: $(PROTO_GEN_CC) $(PROTO_GEN_HEADER)
  

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