diff options
Diffstat (limited to 'package/boost/Makefile')
| -rw-r--r-- | package/boost/Makefile | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/package/boost/Makefile b/package/boost/Makefile index 2add96f5e..4bd846e0f 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= boost -PKG_VERSION:= 1.67.0 -PKG_EXTRAVER:= 1_67 +PKG_VERSION:= 1.84.0 +PKG_EXTRAVER:= 1_84 PKG_RELEASE:= 1 -PKG_HASH:= 8aa4e330c870ef50a896634c931adf468b21f8a69b77007e45c444151229f665 +PKG_HASH:= a5800f405508f5df8114558ca9855d2640a2de8f0445f051fa1c7c3383045724 PKG_DESCR:= portable c++ library PKG_SECTION:= libs/misc -PKG_BUILDDEP:= python2-host +PKG_BUILDDEP:= python3-host PKG_NEEDS:= c++ PKG_URL:= http://www.boost.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/} @@ -19,12 +19,13 @@ PKG_OPTS:= dev DISTFILES:= boost_$(PKG_EXTRAVER)_0.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}_$(PKG_EXTRAVER)_0 -PKG_FLAVOURS_BOOST:= DATE_TIME GRAPH GRAPH_PARALLEL IOSTREAMS LOG MATH PROGRAM_OPTIONS PYTHON REGEX SERIALIZATION SIGNALS TEST WAVE +PKG_FLAVOURS_BOOST:= DATE_TIME JSON GRAPH GRAPH_PARALLEL IOSTREAMS LOG MATH PROGRAM_OPTIONS PYTHON REGEX SERIALIZATION TEST WAVE PKGFD_DATE_TIME:= with date-time +PKGFD_JSON:= with json PKGFD_PYTHON:= with python -PKGFB_PYTHON:= python2 -PKGFS_PYTHON:= python2 +PKGFB_PYTHON:= python3 +PKGFS_PYTHON:= python3 PKGFD_IOSTREAMS:= with iostreams PKGFD_GRAPH:= with graph PKGFD_GRAPH_PARALLEL:= with graph_parallel @@ -33,7 +34,6 @@ PKGFD_LOG:= with log PKGFD_PROGRAM_OPTIONS:= with program_options PKGFD_REGEX:= with regex PKGFD_SERIALIZATION:= with serialization -PKGFD_SIGNALS:= with signals PKGFD_TEST:= with test PKGFD_WAVE:= with wave @@ -41,7 +41,7 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,BOOST,boost,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -include ${ADK_TOPDIR}/mk/python.mk +include ${ADK_TOPDIR}/mk/python3.mk CONFIG_STYLE:= manual BUILD_STYLE:= manual @@ -65,6 +65,9 @@ endif ifeq (${ADK_PACKAGE_BOOST_DATE_TIME},) CONFIGURE_ARGS+= --without-date_time endif +ifeq (${ADK_PACKAGE_BOOST_JSON},) +CONFIGURE_ARGS+= --without-json +endif ifeq (${ADK_PACKAGE_BOOST_PYTHON},) CONFIGURE_ARGS+= --without-python endif @@ -86,9 +89,6 @@ endif ifeq (${ADK_PACKAGE_BOOST_SERIALIZATION},) CONFIGURE_ARGS+= --without-serialization endif -ifeq (${ADK_PACKAGE_BOOST_SIGNALS},) -CONFIGURE_ARGS+= --without-signals -endif ifeq (${ADK_PACKAGE_BOOST_TEST},) CONFIGURE_ARGS+= --without-test endif @@ -96,6 +96,9 @@ ifeq (${ADK_PACKAGE_BOOST_WAVE},) CONFIGURE_ARGS+= --without-wave endif +ifeq ($(ADK_TARGET_ARCH),aarch64) +BOOST_ARCH:= architecture=arm +endif ifeq ($(ADK_TARGET_ARCH),arm) BOOST_ARCH:= architecture=arm endif @@ -121,6 +124,9 @@ endif ifeq ($(ADK_TARGET_ARCH),arm) BOOST_ABI:= abi=aapcs endif +ifeq ($(ADK_TARGET_ARCH),aarch64) +BOOST_ABI:= abi=aapcs +endif ifeq ($(ADK_TARGET_ARCH),mips) BOOST_ABI:= abi=o32 endif @@ -128,7 +134,7 @@ endif # some variables for build GPP_PATH:= ${TOOLCHAIN_DIR}/usr/bin/${GNU_TARGET_NAME}-g++ GPP_VERSION:= "`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`" -BJAM_PATH:= "`find ${WRKBUILD} -type f -name "bjam$(EXEEXT)"`" +BJAM_PATH:= "`find ${WRKBUILD} -type f -name "b2$(EXEEXT)"`" PYTHON_PATH:= ${STAGING_HOST_DIR}/usr/bin/python PYTHON_INCLUDE:="`find ${STAGING_TARGET_DIR}/usr/include/ -maxdepth 1 -type d -name "python*" | head -1`" PYTHON_LIB:= "`find ${STAGING_TARGET_DIR}/usr/lib/ -maxdepth 1 -type d -name "python*" | head -1`" |