diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2012-10-20 17:50:13 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-13 14:09:50 +0000 |
| commit | 9987998d7431fb33b12a7e210024a8193b43e717 (patch) | |
| tree | db4043e10a9774edf425821129979627220eaebf | |
| parent | fa7fb44d1ca2b8a57509806bde19672c68ef157d (diff) | |
| download | openembedded-core-9987998d7431fb33b12a7e210024a8193b43e717.tar.gz openembedded-core-9987998d7431fb33b12a7e210024a8193b43e717.tar.bz2 openembedded-core-9987998d7431fb33b12a7e210024a8193b43e717.zip | |
boost: Activate zlib and bzip2 because they now work.
This patch is needed for making wesnoth(will be sumbited
in meta-games) work.
[RP: Add missing bzip2 dependency]
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 @@ DESCRIPTION = "Free peer-reviewed portable C++ source libraries" HOMEPAGE = "http://www.boost.org/" SECTION = "libs" -DEPENDS = "boost-native zlib" +DEPENDS = "boost-native zlib bzip2" DEPENDS_class-native = "" LICENSE = "BSL-1.0 & MIT & Python-2.0" @@ -16,7 +16,7 @@ BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}" BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" -INC_PR = "r4" +INC_PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2" @@ -109,16 +109,11 @@ EQD = '\"' #boost.bb: "... '-sGCC=... '${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}config${EQD}'${SQD} ..." BJAM_CONF = "${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}boost/config/platform/${TARGET_OS}.hpp${EQD}'${SQD}" -# bzip2 and zip are disabled because... they're broken - the compilation simply -# isn't working with bjam. I guess they will fix it, but who needs it? This -# only affects the (new in 33) iostream library. BJAM_TOOLS = "-sTOOLS=gcc \ '-sGCC=${CC} '${BJAM_CONF} \ '-sGXX=${CXX} '${BJAM_CONF} \ '-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \ '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \ - '-sNO_BZIP2=1' \ - '-sNO_ZLIB=1' \ '-sBUILD=release <optimization>space <threading>multi <inlining>on <debug-symbols>off' \ '-sPYTHON_VERSION=${PYTHON_VERSION}' \ '-sPYTHON_ROOT=${PYTHON_ROOT}' \ |