mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -4,13 +4,17 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BOOST_VERSION = 1.70.0
|
||||
BOOST_VERSION = 1.74.0
|
||||
BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2
|
||||
BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
|
||||
BOOST_SITE = https://dl.bintray.com/boostorg/release/$(BOOST_VERSION)/source
|
||||
BOOST_INSTALL_STAGING = YES
|
||||
BOOST_LICENSE = BSL-1.0
|
||||
BOOST_LICENSE_FILES = LICENSE_1_0.txt
|
||||
|
||||
# CVE-2009-3654 is misclassified (by our CVE tracker) as affecting to boost,
|
||||
# while in fact it affects Drupal (a module called boost in there).
|
||||
BOOST_IGNORE_CVES += CVE-2009-3654
|
||||
|
||||
# keep host variant as minimal as possible
|
||||
HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \
|
||||
--without-libraries=$(subst $(space),$(comma),atomic chrono context \
|
||||
@@ -67,7 +71,7 @@ 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_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m
|
||||
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)
|
||||
@@ -130,10 +134,11 @@ define BOOST_CONFIGURE_CMDS
|
||||
(cd $(@D) && ./bootstrap.sh $(BOOST_FLAGS))
|
||||
echo "using gcc : `$(TARGET_CC) -dumpversion` : $(TARGET_CXX) : <cxxflags>\"$(BOOST_TARGET_CXXFLAGS)\" <linkflags>\"$(TARGET_LDFLAGS)\" ;" > $(@D)/user-config.jam
|
||||
echo "" >> $(@D)/user-config.jam
|
||||
sed -i "s/: -O.* ;/: $(TARGET_OPTIMIZATION) ;/" $(@D)/tools/build/src/tools/gcc.jam
|
||||
endef
|
||||
|
||||
define BOOST_BUILD_CMDS
|
||||
(cd $(@D) && $(TARGET_MAKE_ENV) ./bjam -j$(PARALLEL_JOBS) -q \
|
||||
(cd $(@D) && $(TARGET_MAKE_ENV) ./tools/build/src/engine/bjam -j$(PARALLEL_JOBS) -q \
|
||||
--user-config=$(@D)/user-config.jam \
|
||||
$(BOOST_OPTS) \
|
||||
--ignore-site-config \
|
||||
@@ -150,7 +155,7 @@ define BOOST_INSTALL_TARGET_CMDS
|
||||
endef
|
||||
|
||||
define BOOST_INSTALL_STAGING_CMDS
|
||||
(cd $(@D) && $(TARGET_MAKE_ENV) ./bjam -j$(PARALLEL_JOBS) -q \
|
||||
(cd $(@D) && $(TARGET_MAKE_ENV) ./tools/build/src/engine/bjam -j$(PARALLEL_JOBS) -q \
|
||||
--user-config=$(@D)/user-config.jam \
|
||||
$(BOOST_OPTS) \
|
||||
--prefix=$(STAGING_DIR)/usr \
|
||||
|
||||
Reference in New Issue
Block a user