1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
Description: Make adjustmanets so as to use system's spoa library
Author: Nilesh Patra <nilesh@debian.org>
Forwarded: not-needed
Last-Update: 2021-07-10
--- a/setup.py
+++ b/setup.py
@@ -101,7 +101,7 @@
],
language='c++',
extra_objects=[
- 'src/build/lib/libspoa.a'
+ '/usr/lib/' + os.getenv('DEB_HOST_MULTIARCH') + '/libspoa.so'
],
),
@@ -117,10 +117,6 @@
bdir = "src/build"
rmtree(bdir, ignore_errors=True)
os.makedirs(bdir)
- run([
- "cmake", "-D", "spoa_optimize_for_portability=ON", "-D", "CMAKE_BUILD_TYPE=Release",
- "-D", "CMAKE_CXX_FLAGS='-I ../vendor/cereal/include/ -fPIC '", "..",
- ], cwd=bdir)
run("make", cwd=bdir)
install.run(self)
@@ -135,8 +131,8 @@
long_description=long_description,
long_description_content_type='text/markdown',
ext_modules=ext_modules,
- install_requires=['pybind11>=2.4', 'cmake==3.18.4'],
- setup_requires=['pybind11>=2.4', 'cmake==3.18.4'],
+ install_requires=['pybind11>=2.4'],
+ setup_requires=['pybind11>=2.4'],
cmdclass={
'build_ext': BuildExt,
'develop': build_spoa,
--- a/pyspoa.cpp
+++ b/pyspoa.cpp
@@ -1,4 +1,4 @@
-#include "spoa.hpp"
+#include "spoa/spoa.hpp"
#include <pybind11/stl.h>
#include <pybind11/pybind11.h>
|
