Skip to contentSkip to conversation

glibc-locale: DEPEND on virtual/libc

PATCH In review Joshua Watt 2 participants 2 messages May 30, 2019 – May 31, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 glibc-locale: DEPEND on virtual/libc

The restriction against glibc-locale depending on virtual/libc is removed now that libc-initial no longer exists.

Adding the DEPENDS on virtual/libc fixes a race (and reproducibility issue) where the packages created by this recipe would have different runtime dependencies depending on if libc had generated its packages yet or not.

---
 meta/recipes-core/glibc/glibc-locale.inc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
meta/recipes-core/glibc/glibc-locale.inc +1 -3
index a985d26c75d..f033635bd0d 100644
@@ -12,9 +12,7 @@ BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot"
 BINUTILSDEP_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot"
 do_package[depends] += "${BINUTILSDEP}"
 
-# localedef links with libc.so and glibc-collateral.inc inhibits all default deps
-# cannot add virtual/libc to DEPENDS, because it would conflict with libc-initial in RSS
-RDEPENDS_localedef += "glibc"
+DEPENDS += "virtual/libc"
 
 # 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)
Signature · 1 line
2.21.0
#1 lore raw
Quoted 8 lines · Joshua Watt

The restriction against glibc-locale depending on virtual/libc is removed now that libc-initial no longer exists.

Adding the DEPENDS on virtual/libc fixes a race (and reproducibility issue) where the packages created by this recipe would have different runtime dependencies depending on if libc had generated its packages yet or not.

technically locales are intertwined with glibc so it does not matter but I understand the dependency race point
so lets take it in

Quoted 24 lines
---
 meta/recipes-core/glibc/glibc-locale.inc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
meta/recipes-core/glibc/glibc-locale.inc +1 -4
index a985d26c75d..f033635bd0d 100644
@@ -12,9 +12,7 @@ BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot"
 BINUTILSDEP_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot"
 do_package[depends] += "${BINUTILSDEP}"
 
-# localedef links with libc.so and glibc-collateral.inc inhibits all default deps
-# cannot add virtual/libc to DEPENDS, because it would conflict with libc-initial in RSS
-RDEPENDS_localedef += "glibc"
+DEPENDS += "virtual/libc"
 
 # 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)
--

2.21.0