diff options
Diffstat (limited to 'meta/recipes-core/glibc')
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc.inc | 4 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc_2.28.bb | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 8ac01cee44..07ce75df5d 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -14,7 +14,7 @@ RPROVIDES_glibc-extra-nss = "eglibc-extra-nss" | |||
14 | RPROVIDES_glibc-thread-db = "eglibc-thread-db" | 14 | RPROVIDES_glibc-thread-db = "eglibc-thread-db" |
15 | RPROVIDES_${PN}-pcprofile = "eglibc-pcprofile" | 15 | RPROVIDES_${PN}-pcprofile = "eglibc-pcprofile" |
16 | RPROVIDES_${PN}-dbg = "eglibc-dbg" | 16 | RPROVIDES_${PN}-dbg = "eglibc-dbg" |
17 | libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" | 17 | libc_baselibs = "${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" |
18 | libc_baselibs_append_aarch64 = " /lib/ld-linux-aarch64*.so.1" | 18 | libc_baselibs_append_aarch64 = " /lib/ld-linux-aarch64*.so.1" |
19 | INSANE_SKIP_${PN}_append_aarch64 = " libdir" | 19 | INSANE_SKIP_${PN}_append_aarch64 = " libdir" |
20 | 20 | ||
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 3db55f926f..91491a35f0 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc | |||
@@ -34,9 +34,7 @@ siteconfig_do_siteconfig_gencache_prepend = " \ | |||
34 | # nptl needs unwind support in gcc, which can't be built without glibc. | 34 | # nptl needs unwind support in gcc, which can't be built without glibc. |
35 | DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial libgcc-initial linux-libc-headers virtual/${TARGET_PREFIX}libc-initial" | 35 | DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial libgcc-initial linux-libc-headers virtual/${TARGET_PREFIX}libc-initial" |
36 | 36 | ||
37 | CRYPTPROVIDES = "virtual/crypt" | 37 | PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" |
38 | CRYPTPROVIDES_class-nativesdk = "" | ||
39 | PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc ${CRYPTPROVIDES}" | ||
40 | PROVIDES += "virtual/libintl virtual/libiconv" | 38 | PROVIDES += "virtual/libintl virtual/libiconv" |
41 | inherit autotools texinfo distro_features_check systemd | 39 | inherit autotools texinfo distro_features_check systemd |
42 | 40 | ||
diff --git a/meta/recipes-core/glibc/glibc_2.28.bb b/meta/recipes-core/glibc/glibc_2.28.bb index 086daed04c..906e6c2b62 100644 --- a/meta/recipes-core/glibc/glibc_2.28.bb +++ b/meta/recipes-core/glibc/glibc_2.28.bb | |||
@@ -83,6 +83,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ | |||
83 | --enable-bind-now \ | 83 | --enable-bind-now \ |
84 | --enable-stack-protector=strong \ | 84 | --enable-stack-protector=strong \ |
85 | --enable-stackguard-randomization \ | 85 | --enable-stackguard-randomization \ |
86 | --disable-crypt \ | ||
86 | ${GLIBCPIE} \ | 87 | ${GLIBCPIE} \ |
87 | ${GLIBC_EXTRA_OECONF}" | 88 | ${GLIBC_EXTRA_OECONF}" |
88 | 89 | ||