diff options
Diffstat (limited to 'yocto-poky/meta/recipes-core/uclibc/uclibc.inc')
| -rw-r--r-- | yocto-poky/meta/recipes-core/uclibc/uclibc.inc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/yocto-poky/meta/recipes-core/uclibc/uclibc.inc b/yocto-poky/meta/recipes-core/uclibc/uclibc.inc index 533aa3d95..1d42284fb 100644 --- a/yocto-poky/meta/recipes-core/uclibc/uclibc.inc +++ b/yocto-poky/meta/recipes-core/uclibc/uclibc.inc @@ -13,7 +13,6 @@ SECTION = "libs" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://COPYING.LIB.boilerplate;md5=aaddeadcddeb918297e0e4afc52ce46f \ file://${S}/test/regex/testregex.c;beginline=1;endline=31;md5=234efb227d0a40677f895e4a1e26e960" -PR = "r9" require uclibc-config.inc @@ -40,6 +39,12 @@ COMPATIBLE_HOST = ".*-uclibc.*" INHIBIT_DEFAULT_DEPS = "1" +# There appears to be a parallel race in uclibc: +# GEN /extra/locale/locale_collate.h +# xargs: ../..//extra/locale/gen_collate: Text file busy +# make[1]: *** [../..//extra/locale/locale_collate.h] Error 126 +PARALLEL_MAKE = "" + # do_stage barfs on a CC with whitespace, therefore put the 'HOST_CC_ARCH' in # the CFLAGS (when building the utils). OEMAKE_NO_CC = "'STRIPTOOL=true' 'LD=${LD}'" @@ -57,13 +62,8 @@ export V="2" # -O<n> -fno-omit-frame-pointer ends up with GCC ICE on thumb as reported # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44860 # -CFLAGS_arm := "${@oe_filter_out('-fno-omit-frame-pointer', '${CFLAGS}', d)}" -UCLIBC_EXTRA_CFLAGS := "${@oe_filter_out('(-I\S+|-i\S+)', '${CFLAGS}', d)}" - -do_compile_prepend () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake pregen -} +CFLAGS_remove_arm = "-fno-omit-frame-pointer" +UCLIBC_EXTRA_CFLAGS = "${@oe_filter_out('(-I\S+|-i\S+)', '${CFLAGS}', d)}" configmangle = '/^KERNEL_HEADERS/d; \ /^RUNTIME_PREFIX/d; \ @@ -71,7 +71,7 @@ configmangle = '/^KERNEL_HEADERS/d; \ /^SHARED_LIB_LOADER_PREFIX/d; \ /^UCLIBC_EXTRA_CFLAGS/d; \ s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \ - ${@["","s,.*COMPILE_IN_THUMB_MODE.*,COMPILE_IN_THUMB_MODE=y,;"][d.getVar("ARM_INSTRUCTION_SET", True) != "arm"]} \ + ${@["","s,.*COMPILE_IN_THUMB_MODE.*,COMPILE_IN_THUMB_MODE=y,;"][d.getVar("ARM_INSTRUCTION_SET", True) == "thumb"]} \ ${@["","s,.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y,;"][d.getVar("USE_NLS", True) == "yes"]} \ ${@["","s,.*LDSO_GNU_HASH_SUPPORT.*,# LDSO_GNU_HASH_SUPPORT is not set,;"][d.getVar("TARGET_ARCH", True) in ['mips', 'mipsel', 'mips64', 'mips64el', 'avr32']]} \ /^CROSS/d; \ @@ -82,8 +82,8 @@ configmangle = '/^KERNEL_HEADERS/d; \ /HAS_FPU/d; \ ${@["","s,.*MULTILIB_DIR.*,MULTILIB_DIR=\"${baselib}\",;"][d.getVar("baselib", True) != "lib"]} \ ' -OE_FEATURES := "${@features_to_uclibc_conf(d)}" -OE_DEL := "${@features_to_uclibc_del(d)}" +OE_FEATURES = "${@features_to_uclibc_conf(d)}" +OE_DEL = "${@features_to_uclibc_del(d)}" python () { if "${OE_DEL}": d.setVar('configmangle_append', "${OE_DEL}" + "\n") |
