[caffe-contrib] 318/362: d/rules: only compile with GCC-5, prevent this package from being broken on GCC-6 transition

[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-contrib.

commit 6ee64819025caf50085f5935bb547b7ed0ad4cdb
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sun Mar 13 02:12:53 2016 +0000

    d/rules: only compile with GCC-5, prevent this package from being broken on GCC-6 transition
---
 debian/rules | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/debian/rules b/debian/rules
index 10fafb7..b80303e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,19 +40,15 @@ CMAKE_CONFIGURE_TEMPLATE = \
 	-DUSE_LEVELDB=ON \
 	-DUSE_LMDB=ON \
 	-DUSE_OPENCV=ON \
-	-DCMAKE_CXX_COMPILER= \
-	-DCMAKE_C_COMPILER= \
-	-DCMAKE_INSTALL_PREFIX= \
-	-DCPU_ONLY= \
+	-DCMAKE_CXX_COMPILER=g++-5 \
+	-DCMAKE_C_COMPILER=gcc-5 \
+	-DCMAKE_INSTALL_PREFIX=$(FILL_THIS_BLANK) \
+	-DCPU_ONLY=$(FILL_THIS_BLANK) \
 	-DCUDA_ARCH_NAME="All"
 CONFFLAG_CPU = $(CMAKE_CONFIGURE_TEMPLATE) \
-	-DCMAKE_CXX_COMPILER=g++ \
-	-DCMAKE_C_COMPILER=gcc \
 	-DCMAKE_INSTALL_PREFIX="/caffe_cpu" \
 	-DCPU_ONLY=ON
 CONFFLAG_CUDA = $(CMAKE_CONFIGURE_TEMPLATE) \
-	-DCMAKE_CXX_COMPILER=g++-5 \
-	-DCMAKE_C_COMPILER=gcc-5 \
 	-DCMAKE_INSTALL_PREFIX="/caffe_cuda" \
 	-DCPU_ONLY=OFF
 
@@ -175,13 +171,9 @@ get-orig-source:
 ##
 CUSTOM_JOBS   := "-j5" # number of cores plus 1
 CONFFLAG_CPU_CUSTOM = $(CMAKE_CONFIGURE_TEMPLATE) \
-	-DCMAKE_CXX_COMPILER=g++ \
-	-DCMAKE_C_COMPILER=gcc \
 	-DCMAKE_INSTALL_PREFIX="$(shell pwd)/debian/tmp/caffe_cpu" \
 	-DCPU_ONLY=ON
 CONFFLAG_CUDA_CUSTOM = $(CMAKE_CONFIGURE_TEMPLATE) \
-	-DCMAKE_CXX_COMPILER=g++-5 \
-	-DCMAKE_C_COMPILER=gcc-5 \
 	-DCMAKE_INSTALL_PREFIX="$(shell pwd)/debian/tmp/caffe_cuda" \
 	-DCPU_ONLY=OFF
 #

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