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] (From OE-Core rev: 9987998d7431fb33b12a7e210024a8193b43e717) Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
41125ddc86
commit
c2ea0816af
|
@ -6,7 +6,7 @@
|
||||||
DESCRIPTION = "Free peer-reviewed portable C++ source libraries"
|
DESCRIPTION = "Free peer-reviewed portable C++ source libraries"
|
||||||
HOMEPAGE = "http://www.boost.org/"
|
HOMEPAGE = "http://www.boost.org/"
|
||||||
SECTION = "libs"
|
SECTION = "libs"
|
||||||
DEPENDS = "boost-native zlib"
|
DEPENDS = "boost-native zlib bzip2"
|
||||||
DEPENDS_class-native = ""
|
DEPENDS_class-native = ""
|
||||||
LICENSE = "BSL-1.0 & MIT & Python-2.0"
|
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_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}"
|
||||||
BOOST_P = "boost_${BOOST_VER}"
|
BOOST_P = "boost_${BOOST_VER}"
|
||||||
|
|
||||||
INC_PR = "r4"
|
INC_PR = "r5"
|
||||||
|
|
||||||
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2"
|
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} ..."
|
#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}"
|
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 \
|
BJAM_TOOLS = "-sTOOLS=gcc \
|
||||||
'-sGCC=${CC} '${BJAM_CONF} \
|
'-sGCC=${CC} '${BJAM_CONF} \
|
||||||
'-sGXX=${CXX} '${BJAM_CONF} \
|
'-sGXX=${CXX} '${BJAM_CONF} \
|
||||||
'-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \
|
'-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \
|
||||||
'-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \
|
'-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \
|
||||||
'-sNO_BZIP2=1' \
|
|
||||||
'-sNO_ZLIB=1' \
|
|
||||||
'-sBUILD=release <optimization>space <threading>multi <inlining>on <debug-symbols>off' \
|
'-sBUILD=release <optimization>space <threading>multi <inlining>on <debug-symbols>off' \
|
||||||
'-sPYTHON_VERSION=${PYTHON_VERSION}' \
|
'-sPYTHON_VERSION=${PYTHON_VERSION}' \
|
||||||
'-sPYTHON_ROOT=${PYTHON_ROOT}' \
|
'-sPYTHON_ROOT=${PYTHON_ROOT}' \
|
||||||
|
|
Loading…
Reference in New Issue