summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/tclibc-musl.inc1
-rw-r--r--meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb5
2 files changed, 1 insertions, 5 deletions
diff --git a/meta/conf/distro/include/tclibc-musl.inc b/meta/conf/distro/include/tclibc-musl.inc
index 052ae0e23b..8badbbb40a 100644
--- a/meta/conf/distro/include/tclibc-musl.inc
+++ b/meta/conf/distro/include/tclibc-musl.inc
@@ -9,6 +9,7 @@ LIBCOVERRIDE = ":libc-musl"
9PREFERRED_PROVIDER_virtual/libc ?= "musl" 9PREFERRED_PROVIDER_virtual/libc ?= "musl"
10PREFERRED_PROVIDER_virtual/libiconv ?= "musl" 10PREFERRED_PROVIDER_virtual/libiconv ?= "musl"
11PREFERRED_PROVIDER_virtual/libintl ?= "musl" 11PREFERRED_PROVIDER_virtual/libintl ?= "musl"
12PREFERRED_PROVIDER_virtual/crypt ?= "musl"
12PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" 13PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc"
13PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" 14PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc"
14 15
diff --git a/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb b/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb
index 6ed67a6761..f21029cdad 100644
--- a/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb
+++ b/meta/recipes-core/libxcrypt/libxcrypt_4.0.1.bb
@@ -24,9 +24,4 @@ S = "${WORKDIR}/git"
24BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE} -std=gnu99" 24BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE} -std=gnu99"
25TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}" 25TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
26 26
27python () {
28 if not bb.data.inherits_class('nativesdk', d):
29 raise bb.parse.SkipRecipe("Recipe only applies in nativesdk case for now")
30}
31
32BBCLASSEXTEND = "nativesdk" 27BBCLASSEXTEND = "nativesdk"