mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 09:32:17 +02:00
There are issues with multilib due to the ordering of events where some functions see the remapped multilib dependencies and some do not. A significant problem is that the multilib class needs to make some changes before key expansion and some afterwards but by using existing event handlers, some code sees things in a partially translated state, leading to bugs. This patch changes things to use a new event handler from bitbake which makes the ordering of the changes explcit. The challenge in doing this is that it breaks some existing anonymous python and dyanmic assignments. In some cases these used to be translated and no longer are, meaning MLPREFIX has to be added. In some cases these are now translated and the MLPREFIX can be removed. This change does now make it very clear when MLPREFIX is required and when it is not, its just the migration path which is harder. The patch changes the small number of cases where fixes are needed. In particular, where a variable like RDEPENDS is conditionally extended (e.g. with an override), MLPREFIX is now required. This patch also reverts: base: Revert 'base.bbclass: considering multilib when setting LICENSE_EXCLUSION' This reverts 6597130256a1609c3e05ec5891aceaf549c37985 as the changes to multilib datastore handling mean its no longer necessary. (From OE-Core rev: b3fda056a674889cd9697e779de023d4f993d3ce) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
217 lines
7.7 KiB
PHP
217 lines
7.7 KiB
PHP
SUMMARY = "Free peer-reviewed portable C++ source libraries"
|
|
SECTION = "libs"
|
|
DEPENDS = "bjam-native zlib bzip2"
|
|
|
|
CVE_PRODUCT = "boost:boost"
|
|
|
|
ARM_INSTRUCTION_SET_armv4 = "arm"
|
|
ARM_INSTRUCTION_SET_armv5 = "arm"
|
|
|
|
BOOST_LIBS = "\
|
|
atomic \
|
|
chrono \
|
|
container \
|
|
contract \
|
|
date_time \
|
|
exception \
|
|
filesystem \
|
|
graph \
|
|
iostreams \
|
|
log \
|
|
math \
|
|
program_options \
|
|
random \
|
|
regex \
|
|
serialization \
|
|
system \
|
|
timer \
|
|
test \
|
|
thread \
|
|
wave \
|
|
"
|
|
|
|
# only supported by x86 and powerpc
|
|
BOOST_LIBS_append_x86 = " context coroutine"
|
|
BOOST_LIBS_append_x86-64 = " context coroutine"
|
|
BOOST_LIBS_append_powerpc = " context coroutine"
|
|
BOOST_LIBS_append_arm = " context coroutine"
|
|
BOOST_LIBS_append_aarch64 = " context coroutine"
|
|
# need consistent settings for native builds (x86 override not applied for native)
|
|
BOOST_LIBS_remove_class-native = " context coroutine"
|
|
# does not compile
|
|
BOOST_LIBS_remove_mips16e = "wave"
|
|
|
|
# optional libraries
|
|
PACKAGECONFIG ??= "locale python"
|
|
PACKAGECONFIG[locale] = ",,icu"
|
|
PACKAGECONFIG[graph_parallel] = ",,,boost-mpi mpich"
|
|
PACKAGECONFIG[mpi] = ",,mpich"
|
|
PACKAGECONFIG[python] = ",,python3"
|
|
|
|
BOOST_LIBS += "\
|
|
${@bb.utils.filter('PACKAGECONFIG', 'locale python', d)} \
|
|
${@bb.utils.contains('PACKAGECONFIG', 'graph_parallel', 'graph_parallel mpi', \
|
|
bb.utils.filter('PACKAGECONFIG', 'mpi', d), d)} \
|
|
"
|
|
|
|
inherit python3-dir
|
|
PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}"
|
|
|
|
# Make a package for each library, plus -dev
|
|
PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}"
|
|
python __anonymous () {
|
|
packages = []
|
|
extras = []
|
|
mlprefix = d.getVar("MLPREFIX")
|
|
for lib in d.getVar('BOOST_LIBS').split():
|
|
extras.append("--with-%s" % lib)
|
|
pkg = "boost-%s" % (lib.replace("_", "-"))
|
|
packages.append(mlprefix + pkg)
|
|
if not d.getVar("FILES_%s" % pkg):
|
|
d.setVar("FILES_%s%s" % (mlprefix, pkg), "${libdir}/libboost_%s*.so.*" % lib)
|
|
else:
|
|
d.setVar("FILES_%s%s" % (mlprefix, pkg), d.getVar("FILES_%s" % pkg))
|
|
|
|
d.setVar("BOOST_PACKAGES", " ".join(packages))
|
|
d.setVar("BJAM_EXTRA", " ".join(extras))
|
|
}
|
|
|
|
# Override the contents of specific packages
|
|
FILES_${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*"
|
|
FILES_${PN}-locale = "${libdir}/libboost_locale.so.*"
|
|
FILES_${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*"
|
|
FILES_boost-serialization = "${libdir}/libboost_serialization*.so.* \
|
|
${libdir}/libboost_wserialization*.so.*"
|
|
FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \
|
|
${libdir}/libboost_unit_test_framework*.so.*"
|
|
|
|
# -dev last to pick up the remaining stuff
|
|
PACKAGES += "${PN}-dev ${PN}-staticdev"
|
|
FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/cmake"
|
|
FILES_${PN}-staticdev = "${libdir}/libboost_*.a"
|
|
|
|
# "boost" is a metapackage which pulls in all boost librabries
|
|
PACKAGES += "${PN}"
|
|
FILES_${PN} = ""
|
|
ALLOW_EMPTY_${PN} = "1"
|
|
RRECOMMENDS_${PN} += "${BOOST_PACKAGES}"
|
|
RRECOMMENDS_${PN}_class-native = ""
|
|
|
|
# to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works
|
|
TARGET_CC_ARCH += "${LDFLAGS}"
|
|
|
|
# Oh yippee, a new build system, it's sooo cooool I could eat my own
|
|
# foot. inlining=on lets the compiler choose, I think. At least this
|
|
# stuff is documented...
|
|
# NOTE: if you leave <debug-symbols>on then in a debug build the build sys
|
|
# objcopy will be invoked, and that won't work. Building debug apparently
|
|
# requires hacking gcc-tools.jam
|
|
#
|
|
# Sometimes I wake up screaming. Famous figures are gathered in the nightmare,
|
|
# Steve Bourne, Larry Wall, the whole of the ANSI C committee. They're just
|
|
# standing there, waiting, but the truely terrifying thing is what they carry
|
|
# in their hands. At first sight each seems to bear the same thing, but it is
|
|
# not so for the forms in their grasp are ever so slightly different one from
|
|
# the other. Each is twisted in some grotesque way from the other to make each
|
|
# an unspeakable perversion impossible to perceive without the onset of madness.
|
|
# True insanity awaits anyone who perceives all of these horrors together.
|
|
#
|
|
# Quotation marks, there might be an easier way to do this, but I can't find
|
|
# it. The problem is that the user.hpp configuration file must receive a
|
|
# pre-processor macro defined as the appropriate string - complete with "'s
|
|
# around it. (<> is a possibility here but the danger to that is that the
|
|
# failure case interprets the < and > as shell redirections, creating
|
|
# random files in the source tree.)
|
|
#
|
|
#bjam: '-DBOOST_PLATFORM_CONFIG=\"config\"'
|
|
#do_compile: '-sGCC=... '"'-DBOOST_PLATFORM_CONFIG=\"config\"'"
|
|
SQD = '"'
|
|
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}"
|
|
|
|
BJAM_TOOLS = "--ignore-site-config \
|
|
'-sTOOLS=gcc' \
|
|
'-sGCC=${CC} '${BJAM_CONF} \
|
|
'-sGXX=${CXX} '${BJAM_CONF} \
|
|
'-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \
|
|
'-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \
|
|
'-sBUILD=release <optimization>space <threading>multi <inlining>on <debug-symbols>off' \
|
|
'-sPYTHON_ROOT=${PYTHON_ROOT}' \
|
|
'--layout=system' \
|
|
"
|
|
|
|
# use PARALLEL_MAKE to speed up the build
|
|
BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d')}"
|
|
BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \
|
|
${BJAM_TOOLS} \
|
|
-sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \
|
|
--build-dir=${S}/${TARGET_SYS} \
|
|
--disable-icu \
|
|
${BJAM_EXTRA}'
|
|
|
|
# Native compilation of bzip2 isn't working
|
|
BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1'
|
|
|
|
# Adjust the build for x32
|
|
BJAM_OPTS_append_x86-x32 = " abi=x32 address-model=64"
|
|
|
|
# cross compiling for arm fails to detect abi, so provide some help
|
|
BJAM_OPTS_append_arm = " abi=aapcs architecture=arm"
|
|
BJAM_OPTS_append_aarch64 = " abi=aapcs address-model=64 architecture=arm"
|
|
|
|
do_configure() {
|
|
cp -f ${S}/boost/config/platform/linux.hpp ${S}/boost/config/platform/linux-gnueabi.hpp
|
|
|
|
# D2194:Fixing the failure of "error: duplicate initialization of gcc with the following parameters" during compilation.
|
|
rm -f ${WORKDIR}/user-config.jam
|
|
echo 'using gcc : 4.3.1 : ${CXX} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;' >> ${WORKDIR}/user-config.jam
|
|
|
|
# If we want Python then we need to tell Boost *exactly* where to find it
|
|
if ${@bb.utils.contains('BOOST_LIBS', 'python', 'true', 'false', d)}; then
|
|
echo "using python : ${PYTHON_BASEVERSION} : ${STAGING_DIR_HOST}${bindir}/python3 : ${STAGING_DIR_HOST}${includedir}/${PYTHON_DIR}${PYTHON_ABI} : ${STAGING_DIR_HOST}${libdir}/${PYTHON_DIR} ;" >> ${WORKDIR}/user-config.jam
|
|
fi
|
|
|
|
if ${@bb.utils.contains('BOOST_LIBS', 'mpi', 'true', 'false', d)}; then
|
|
echo "using mpi : : <find-shared-library>mpi ;" >> ${WORKDIR}/user-config.jam
|
|
fi
|
|
|
|
CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" ./bootstrap.sh --with-bjam=bjam --with-toolset=gcc
|
|
|
|
# Boost can't be trusted to find Python on it's own, so remove any mention
|
|
# of it from the boost configuration
|
|
sed -i '/using python/d' ${S}/project-config.jam
|
|
}
|
|
|
|
do_compile() {
|
|
rm -rf ${S}/${TARGET_SYS}
|
|
bjam ${BJAM_OPTS} --prefix=${prefix} \
|
|
--exec-prefix=${exec_prefix} \
|
|
--libdir=${libdir} \
|
|
--includedir=${includedir} \
|
|
--debug-configuration
|
|
}
|
|
|
|
do_install() {
|
|
bjam ${BJAM_OPTS} \
|
|
--libdir=${D}${libdir} \
|
|
--includedir=${D}${includedir} \
|
|
install
|
|
for lib in ${BOOST_LIBS}; do
|
|
if [ -e ${D}${libdir}/libboost_${lib}.a ]; then
|
|
ln -s libboost_${lib}.a ${D}${libdir}/libboost_${lib}-mt.a
|
|
fi
|
|
if [ -e ${D}${libdir}/libboost_${lib}.so ]; then
|
|
ln -s libboost_${lib}.so ${D}${libdir}/libboost_${lib}-mt.so
|
|
fi
|
|
done
|
|
|
|
# Cmake files reference full paths to image
|
|
find ${D}${libdir}/cmake -type f | \
|
|
grep 'cmake$' | \
|
|
xargs -n 1 sed -e 's,${D}${libdir}/cmake,${libdir}/cmake,' -i
|
|
|
|
}
|
|
|
|
BBCLASSEXTEND = "native nativesdk"
|