|
 |
1584487 |
From 46361ca058295e3f08d3c54196d990c497834306 Mon Sep 17 00:00:00 2001
|
|
|
1584487 |
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
|
1584487 |
Date: Fri, 30 Mar 2018 03:15:51 -0400
|
|
|
1584487 |
Subject: [PATCH] Force using system qhull.
|
|
|
1584487 |
|
|
|
1584487 |
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
|
1584487 |
---
|
|
|
1584487 |
setupext.py | 17 ++---------------
|
|
|
1584487 |
1 file changed, 2 insertions(+), 15 deletions(-)
|
|
|
1584487 |
|
|
|
1584487 |
diff --git a/setupext.py b/setupext.py
|
|
|
1584487 |
index d2ff239ad..30e0c9085 100644
|
|
|
1584487 |
--- a/setupext.py
|
|
|
1584487 |
+++ b/setupext.py
|
|
|
1584487 |
@@ -1318,23 +1318,10 @@ class Qhull(SetupPackage):
|
|
|
1584487 |
|
|
|
1584487 |
def check(self):
|
|
|
1584487 |
self.__class__.found_external = True
|
|
|
1584487 |
- try:
|
|
|
1584487 |
- return self._check_for_pkg_config(
|
|
|
1584487 |
- 'libqhull', 'libqhull/qhull_a.h', min_version='2015.2')
|
|
|
1584487 |
- except CheckFailed as e:
|
|
|
1584487 |
- self.__class__.found_pkgconfig = False
|
|
|
1584487 |
- self.__class__.found_external = False
|
|
|
1584487 |
- return str(e) + ' Using local copy.'
|
|
|
1584487 |
+ return ' Using system copy.'
|
|
|
1584487 |
|
|
|
1584487 |
def add_flags(self, ext):
|
|
|
1584487 |
- if self.found_external:
|
|
|
1584487 |
- pkg_config.setup_extension(ext, 'qhull',
|
|
|
1584487 |
- default_libraries=['qhull'])
|
|
|
1584487 |
- else:
|
|
|
1584487 |
- ext.include_dirs.insert(0, 'extern')
|
|
|
1584487 |
- ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c')))
|
|
|
1584487 |
- if sysconfig.get_config_var('LIBM') == '-lm':
|
|
|
1584487 |
- ext.libraries.extend('m')
|
|
|
1584487 |
+ ext.libraries.append('qhull')
|
|
|
1584487 |
|
|
|
1584487 |
|
|
|
1584487 |
class TTConv(SetupPackage):
|
|
|
1584487 |
--
|
|
|
1584487 |
2.14.3
|
|
|
1584487 |
|