sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

eglibc: Move compile with optimization handling to common code 

The optimisation handling code is not version specific, so move the
fix code to the .inc.

(From OE-Core rev: 22dfc7d5738a20f015d9de693f0c2accfa685560)

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jackie Huang 2012-11-28 14:11:30 +08:00 committed by Richard Purdie
parent 1c7aa5635a
commit 3067a91477
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meta/recipes-core/eglibc/eglibc.inc
View File

@ -8,6 +8,17 @@ PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}"
# eglibc can't be built without optimization, if someone tries to compile an
# entire image as -O0, we override it with -O2 here and give a note about it.
def get_optimization(d):
selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True)
if base_contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x":
bb.note("eglibc can't be built with -O0, -O2 will be used instead.")
return selected_optimization.replace("-O0", "-O2")
return selected_optimization
SELECTED_OPTIMIZATION := "${@get_optimization(d)}"
# siteconfig.bbclass runs configure which needs a working compiler
# For the compiler to work we need a working libc yet libc isn't
# in the sysroots directory at this point. This means the libc.so

11
meta/recipes-core/eglibc/eglibc_2.16.bb
View File

@ -87,17 +87,6 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"
# eglibc can't be built without optimization, if someone tries to compile an
# entire image as -O0, we override it with -O2 here and give a note about it.
def get_optimization(d):
selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True)
if base_contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x":
bb.note("eglibc can't be built with -O0, -O2 will be used instead.")
return selected_optimization.replace("-O0", "-O2")
return selected_optimization
SELECTED_OPTIMIZATION := "${@get_optimization(d)}"
do_unpack_append() {
bb.build.exec_func('do_move_ports', d)
}