mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 22:26:31 +00:00
package/python-libconfig: fix build with python 3.8
Fixes: - http://autobuild.buildroot.org/results/edf32c178b7912a987e119f776a51f464424dceb Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
1e55b66e97
commit
177013b86e
@ -1,44 +0,0 @@
|
|||||||
From 3bc4b9c0d60a735b1d63e52f74492ace39f02824 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Yegor Yefremov <yegorslists@googlemail.com>
|
|
||||||
Date: Thu, 27 Jul 2017 09:46:07 +0200
|
|
||||||
Subject: [PATCH] Determine boost_python name depending on current Python
|
|
||||||
version
|
|
||||||
|
|
||||||
Python2 requires boost_python27 and Python3 requires boost_python37
|
|
||||||
(since boost 1.67).
|
|
||||||
|
|
||||||
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
|
|
||||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
||||||
[Bernd: adapted for python-3.7]
|
|
||||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
||||||
---
|
|
||||||
setup.py | 6 +++++-
|
|
||||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index fdf5c27..4b38569 100644
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -3,6 +3,10 @@
|
|
||||||
from setuptools import setup, find_packages, Extension
|
|
||||||
import sys, os
|
|
||||||
|
|
||||||
+boostlib = "boost_python37"
|
|
||||||
+if sys.version_info < (3, 0):
|
|
||||||
+ boostlib = "boost_python27"
|
|
||||||
+
|
|
||||||
setup(
|
|
||||||
name = 'pylibconfig',
|
|
||||||
description = "libconfig bindings for Python",
|
|
||||||
@@ -19,7 +23,7 @@ setup(
|
|
||||||
Extension(
|
|
||||||
"pylibconfig",
|
|
||||||
["src/pylibconfig.cc"],
|
|
||||||
- libraries=["boost_python", "config++"]
|
|
||||||
+ libraries=[boostlib, "config++"]
|
|
||||||
#include_dirs=includes,
|
|
||||||
#extra_link_args=lflags
|
|
||||||
)
|
|
||||||
--
|
|
||||||
2.11.0
|
|
||||||
|
|
@ -14,4 +14,16 @@ PYTHON_LIBCONFIG_SETUP_TYPE = setuptools
|
|||||||
|
|
||||||
PYTHON_LIBCONFIG_DEPENDENCIES = libconfig boost
|
PYTHON_LIBCONFIG_DEPENDENCIES = libconfig boost
|
||||||
|
|
||||||
|
ifeq ($(BR2_PACKAGE_PYTHON),y)
|
||||||
|
PYTHON_LIBCONFIG_PYVER = $(PYTHON_VERSION_MAJOR)
|
||||||
|
else ifeq ($(BR2_PACKAGE_PYTHON3),y)
|
||||||
|
PYTHON_LIBCONFIG_PYVER = $(PYTHON3_VERSION_MAJOR)
|
||||||
|
endif
|
||||||
|
|
||||||
|
define PYTHON_LIBCONFIG_FIX_SETUP
|
||||||
|
$(SED) 's/boost_python/boost_python$(subst .,,$(PYTHON_LIBCONFIG_PYVER))/g' \
|
||||||
|
$(@D)/setup.py
|
||||||
|
endef
|
||||||
|
PYTHON_LIBCONFIG_POST_PATCH_HOOKS += PYTHON_LIBCONFIG_FIX_SETUP
|
||||||
|
|
||||||
$(eval $(python-package))
|
$(eval $(python-package))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user