diff options
author | Nathan Rossi <nathan.rossi@digi.com> | 2022-11-03 07:56:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-11 13:43:40 +0000 |
commit | 60ab170228f05a4c4758c0b9d8e02a9518178af6 (patch) | |
tree | 6dea540ae66cb5353fedd64b6da812261823f184 | |
parent | 44aeb523c85f1433966f6355fff28f0c481ba363 (diff) | |
download | poky-60ab170228f05a4c4758c0b9d8e02a9518178af6.tar.gz |
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: 8a40d0a6039e87a5b4b26a0e84dd797fe5c75cba)
Signed-off-by: Nathan Rossi <nathan.rossi@digi.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/glibc/glibc-locale.inc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc index 7c14abfe99..7f70b3ca4f 100644 --- a/meta/recipes-core/glibc/glibc-locale.inc +++ b/meta/recipes-core/glibc/glibc-locale.inc | |||
@@ -5,14 +5,9 @@ SUMMARY = "Locale data from glibc" | |||
5 | BPN = "glibc" | 5 | BPN = "glibc" |
6 | LOCALEBASEPN = "${MLPREFIX}glibc" | 6 | LOCALEBASEPN = "${MLPREFIX}glibc" |
7 | 7 | ||
8 | # glibc-collateral.inc inhibits all default deps, but do_package needs objcopy | 8 | # Do not inhibit default deps, do_package requires binutils/gcc for |
9 | # 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') | 9 | # objcopy/gcc-nm and glibc-locale depends on virtual/libc directly. |
10 | # ERROR: Function failed: split_and_strip_files | 10 | INHIBIT_DEFAULT_DEPS = "" |
11 | BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" | ||
12 | BINUTILSDEP:class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" | ||
13 | do_package[depends] += "${BINUTILSDEP}" | ||
14 | |||
15 | DEPENDS += "virtual/libc" | ||
16 | 11 | ||
17 | # Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION | 12 | # Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION |
18 | # is set. The idea is to avoid running localedef on the target (at first boot) | 13 | # is set. The idea is to avoid running localedef on the target (at first boot) |