From patchwork Sat Oct 20 15:50:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: boost: Activate zlib and bzip2 because they now work. Date: Sat, 20 Oct 2012 15:50:13 -0000 From: Denis Carikli X-Patchwork-Id: 38351 Message-Id: <1350748213-6436-1-git-send-email-GNUtoo@no-log.org> To: openembedded-core@lists.openembedded.org This patch is needed for making wesnoth(will be sumbited in meta-games) work. Signed-off-by: Denis 'GNUtoo' Carikli --- meta/recipes-support/boost/boost.inc | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index ec602a6..f836243 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -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 space multi on off' \ '-sPYTHON_VERSION=${PYTHON_VERSION}' \ '-sPYTHON_ROOT=${PYTHON_ROOT}' \