From 82fc920fbe0dc774e2cf8639b450ac9e0b29d56a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 9 Feb 2022 17:50:31 +0100 Subject: [PATCH] package/boost: drop python2 support Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/boost/Config.in | 2 +- package/boost/boost.mk | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 2c458bf88a..33a5337096 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -296,7 +296,7 @@ config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS config BR2_PACKAGE_BOOST_PYTHON bool "boost-python" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 help The Boost Python Library is a framework for interfacing Python and C++. It allows you to quickly and seamlessly expose C++ diff --git a/package/boost/boost.mk b/package/boost/boost.mk index b6681b0ad3..032ba5c820 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -68,16 +68,11 @@ BOOST_DEPENDENCIES += bzip2 zlib endif ifeq ($(BR2_PACKAGE_BOOST_PYTHON),y) -BOOST_FLAGS += --with-python-root=$(HOST_DIR) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) +BOOST_FLAGS += \ + --with-python-root=$(HOST_DIR) \ + --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) BOOST_DEPENDENCIES += python3 -else -BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) -BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -BOOST_DEPENDENCIES += python -endif endif HOST_BOOST_OPTS += --no-cmake-config toolset=gcc threading=multi \