mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 09:32:17 +02:00
glibc-locale: Do not INHIBIT_DEFAULT_DEPS
The glibc-locale recipe already partially depends on the base depends in order to satisfy the do_package dependency on binutils. However since commit d6ffd683bf6 NM has defaulted to gcc-nm, meaning do_package depends on gcc (for minidebuginfo). Whilst the do_package task could handle having the dependencies explicitly defined (either in glibc-locale or in package.bbclass), setting these would require some amount of conditional dependency configuration (cross/crosssdk/etc.). Since both binutils and gcc are already dependencies of virtual/libc (although compilerlibs is not), having glibc-locale not inhibit the default depends simplifies the handling of this situation for both glibc-locale and package.bbclass. (From OE-Core rev: 97020ee9912663196a7e8a524a23b0b70d8cf686) Signed-off-by: Nathan Rossi <nathan.rossi@digi.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 8a40d0a6039e87a5b4b26a0e84dd797fe5c75cba) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
ca97e3568e
commit
2f1ac269b1
@@ -5,14 +5,9 @@ SUMMARY = "Locale data from glibc"
|
||||
BPN = "glibc"
|
||||
LOCALEBASEPN = "${MLPREFIX}glibc"
|
||||
|
||||
# glibc-collateral.inc inhibits all default deps, but do_package needs objcopy
|
||||
# ERROR: objcopy failed with exit code 127 (cmd was 'i586-webos-linux-objcopy' --only-keep-debug 'glibc-locale/2.17-r0/package/usr/lib/gconv/IBM1166.so' 'glibc-locale/2.17-r0/package/usr/lib/gconv/.debug/IBM1166.so')
|
||||
# ERROR: Function failed: split_and_strip_files
|
||||
BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot"
|
||||
BINUTILSDEP:class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot"
|
||||
do_package[depends] += "${BINUTILSDEP}"
|
||||
|
||||
DEPENDS += "virtual/libc"
|
||||
# Do not inhibit default deps, do_package requires binutils/gcc for
|
||||
# objcopy/gcc-nm and glibc-locale depends on virtual/libc directly.
|
||||
INHIBIT_DEFAULT_DEPS = ""
|
||||
|
||||
# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION
|
||||
# is set. The idea is to avoid running localedef on the target (at first boot)
|
||||
|
||||
Reference in New Issue
Block a user