diff options
| -rw-r--r-- | meta/recipes-support/boost/boost.inc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 36a94e10ea..830fcb0568 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | DESCRIPTION = "Free peer-reviewed portable C++ source libraries" | 6 | DESCRIPTION = "Free peer-reviewed portable C++ source libraries" |
| 7 | HOMEPAGE = "http://www.boost.org/" | 7 | HOMEPAGE = "http://www.boost.org/" |
| 8 | SECTION = "libs" | 8 | SECTION = "libs" |
| 9 | DEPENDS = "boost-native zlib" | 9 | DEPENDS = "boost-native zlib bzip2" |
| 10 | DEPENDS_class-native = "" | 10 | DEPENDS_class-native = "" |
| 11 | LICENSE = "BSL-1.0 & MIT & Python-2.0" | 11 | LICENSE = "BSL-1.0 & MIT & Python-2.0" |
| 12 | 12 | ||
| @@ -16,7 +16,7 @@ BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}" | |||
| 16 | BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" | 16 | BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" |
| 17 | BOOST_P = "boost_${BOOST_VER}" | 17 | BOOST_P = "boost_${BOOST_VER}" |
| 18 | 18 | ||
| 19 | INC_PR = "r4" | 19 | INC_PR = "r5" |
| 20 | 20 | ||
| 21 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2" | 21 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2" |
| 22 | 22 | ||
| @@ -109,16 +109,11 @@ EQD = '\"' | |||
| 109 | #boost.bb: "... '-sGCC=... '${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}config${EQD}'${SQD} ..." | 109 | #boost.bb: "... '-sGCC=... '${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}config${EQD}'${SQD} ..." |
| 110 | BJAM_CONF = "${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}boost/config/platform/${TARGET_OS}.hpp${EQD}'${SQD}" | 110 | BJAM_CONF = "${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}boost/config/platform/${TARGET_OS}.hpp${EQD}'${SQD}" |
| 111 | 111 | ||
| 112 | # bzip2 and zip are disabled because... they're broken - the compilation simply | ||
| 113 | # isn't working with bjam. I guess they will fix it, but who needs it? This | ||
| 114 | # only affects the (new in 33) iostream library. | ||
| 115 | BJAM_TOOLS = "-sTOOLS=gcc \ | 112 | BJAM_TOOLS = "-sTOOLS=gcc \ |
| 116 | '-sGCC=${CC} '${BJAM_CONF} \ | 113 | '-sGCC=${CC} '${BJAM_CONF} \ |
| 117 | '-sGXX=${CXX} '${BJAM_CONF} \ | 114 | '-sGXX=${CXX} '${BJAM_CONF} \ |
| 118 | '-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \ | 115 | '-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \ |
| 119 | '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \ | 116 | '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \ |
| 120 | '-sNO_BZIP2=1' \ | ||
| 121 | '-sNO_ZLIB=1' \ | ||
| 122 | '-sBUILD=release <optimization>space <threading>multi <inlining>on <debug-symbols>off' \ | 117 | '-sBUILD=release <optimization>space <threading>multi <inlining>on <debug-symbols>off' \ |
| 123 | '-sPYTHON_VERSION=${PYTHON_VERSION}' \ | 118 | '-sPYTHON_VERSION=${PYTHON_VERSION}' \ |
| 124 | '-sPYTHON_ROOT=${PYTHON_ROOT}' \ | 119 | '-sPYTHON_ROOT=${PYTHON_ROOT}' \ |
