[caffe] 123/249: d/rules: update custom target
Zhou Mo
cdluminate-guest at moszumanska.debian.org
Tue Mar 8 14:51:30 UTC 2016
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 f66484546ea2b19c3dd4607f9df797e7ec08b199
Author: Zhou Mo <cdluminate at gmail.com>
Date: Tue Sep 1 07:47:36 2015 +0000
d/rules: update custom target
---
debian/rules | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/rules b/debian/rules
index 19bbf5d..490697a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,14 +105,14 @@ get-orig-source:
# of user's machines, it's good to provide a custom build target,
# allowing users to build their locally performance-optimized packages.
# TODO: Test if following custom works
+CUSTOM_CONFIG := ""
.PHONY: custom-cpu custom-cuda
custom-cpu:
dch --local='+custom' "Custom build of caffe-cpu on `uname -a`"
- #LANG=C $(RULES) TARGET=build binary
- $(RULES) clean
+ dh_auto_clean --builddirectory=${CAFFE_CPU_BUILDDIR}
dh_auto_configure \
--builddirectory=${CAFFE_CPU_BUILDDIR} \
- -- $(CONFFLAG_CPU) $@
+ -- $(CONFFLAG_CPU) $(CUSTOM_CONFIG)
dh_auto_build --builddirectory=${CAFFE_CPU_BUILDDIR}
dh_auto_test --builddirectory=${CAFFE_CPU_BUILDDIR} \
-- runtest LD_LIBRARY_PATH=${CAFFE_CPU_BUILDDIR}/lib/
@@ -123,10 +123,10 @@ custom-cpu:
--package=python-caffe-cpu
custom-cuda:
dch --local='+custom' "Custom build of caffe-cuda on `uname -a`"
- $(RULES) clean
+ dh_auto_clean --builddirectory=${CAFFE_CUDA_BUILDDIR}
dh_auto_configure \
--builddirectory=${CAFFE_CUDA_BUILDDIR} \
- -- $(CONFFLAG_CUDA) $@
+ -- $(CONFFLAG_CUDA) $(CUSTOM_CONFIG)
dh_auto_build --builddirectory=${CAFFE_CUDA_BUILDDIR}
-dh_auto_test --builddirectory=${CAFFE_CUDA_BUILDDIR} \
-- runtest LD_LIBRARY_PATH=${CAFFE_CUDA_BUILDDIR}/lib/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe.git
More information about the debian-science-commits
mailing list