blob: 7ea253ffd18999e8dec897d348adf032b298ed92 (
plain)
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
46
47
48
49
50
|
From 085eb27d2931ffa99a38043ef630107aca1017c9 Mon Sep 17 00:00:00 2001
From: Mykola Salomatin <mykola.salomatin@globallogic.com>
Date: Thu, 12 Aug 2021 17:31:15 +0300
Subject: [PATCH] Fixed build with Python3.8 and Boost 1.72
---
setup.py | 6 ++----
src/Makefile | 9 ++-------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/setup.py b/setup.py
index 3a9f534..19246cf 100755
--- a/setup.py
+++ b/setup.py
@@ -18,10 +18,8 @@ if sys.platform.startswith('linux'):
glib_libs = glib_libs.strip().split("-l")
glib_libs = [x.strip() for x in glib_libs if x]
- if sys.version_info.major == 3:
- boost_libs = ["boost_python-py34"]
- else:
- boost_libs = ["boost_python"]
+ boost_libs = ["boost_python38"]
+
extension_modules = [
Extension(
'gattlib',
diff --git a/src/Makefile b/src/Makefile
index 4c742d2..325ee37 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,13 +7,8 @@ TARGETS = gattlib.so
OBJECTS = att.o crypto.o uuid.o gatt.o gattrib.o btio.o log.o utils.o \
gattservices.o gattlib.o bindings.o beacon.o
-ifeq ($(PYTHON_VER),3)
- PYTHON_CONFIG = python3-config
- BOOST_PYTHON = boost_python-py34
-else
- PYTHON_CONFIG = python-config
- BOOST_PYTHON = boost_python
-endif
+PYTHON_CONFIG = python3-config
+BOOST_PYTHON = boost_python38
CFLAGS += -ggdb -fPIC -Wall $$($(PYTHON_CONFIG) --includes) \
-Ibluez $$(pkg-config --cflags glib-2.0)
--
2.25.1
|
