Skip to content
Snippets Groups Projects
Commit 6aeb7427 authored by Yaroslav Halchenko's avatar Yaroslav Halchenko
Browse files

up_system_libsvm_no_svmhdepends -- do not use shipped svm.h

parent 5c4b52a5
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,9 @@ scikit-learn (0.5~rc3-1) experimental; urgency=low ...@@ -3,6 +3,9 @@ scikit-learn (0.5~rc3-1) experimental; urgency=low
* New upstream release-candidate * New upstream release-candidate
- pruning joblib in favor of external package - pruning joblib in favor of external package
added patch deb_use_system_joblib added patch deb_use_system_joblib
* New patches for upstream
- up_libsvm_verbosity_control -- API for controlling libsvm verbosity
- up_system_libsvm_no_svmhdepends -- do not use shipped svm.h
* Deprecated patches: * Deprecated patches:
- up_workaround_numpy_cython_issue589652 - up_workaround_numpy_cython_issue589652
- deb_cython_0.12.1 - deb_cython_0.12.1
......
up_system_libsvm_no_svmhdepends
up_libsvm_verbosity_control
deb_use_system_joblib deb_use_system_joblib
deb_use_system_libraries deb_use_system_libraries
up_libsvm_verbosity_control
deb_libsvm_cythoning deb_libsvm_cythoning
--- a/scikits/learn/svm/setup.py
+++ b/scikits/learn/svm/setup.py
@@ -22,6 +22,7 @@ def configuration(parent_package='', top
libsvm_libraries = []
libsvm_library_dirs = []
libsvm_sources = [join('src', 'libsvm', '_libsvm.c')]
+ libsvm_depends = [join('src', 'libsvm', 'libsvm_helper.c')]
# we try to link against system-wide libsvm
if site_cfg.has_section('libsvm'):
@@ -31,15 +32,15 @@ def configuration(parent_package='', top
else:
# if not specified, we build our own libsvm
libsvm_sources.append(join('src', 'libsvm', 'svm.cpp'))
+ libsvm_depends.append(join('src', 'libsvm', 'svm.h'))
config.add_extension('_libsvm',
sources=libsvm_sources,
include_dirs=libsvm_includes,
libraries=libsvm_libraries,
library_dirs=libsvm_library_dirs,
- depends=[join('src', 'libsvm', 'svm.h'),
- join('src', 'libsvm', 'libsvm_helper.c')],
- )
+ depends=libsvm_depends,
+ )
### liblinear module
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment