diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc-package.inc')
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 54e2a08906..90437a1c6f 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | INHIBIT_SYSROOT_STRIP = "1" | 1 | INHIBIT_SYSROOT_STRIP = "1" |
2 | 2 | ||
3 | PACKAGES = "${PN}-dbg catchsegv sln nscd ldconfig ldd tzcode glibc-thread-db ${PN}-pic libmemusage malloc-debug libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-src" | 3 | PACKAGES = "${PN}-dbg catchsegv sln nscd ldconfig ldd ldso tzcode glibc-thread-db ${PN}-pic libmemusage malloc-debug libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-src" |
4 | 4 | ||
5 | # The ld.so in this glibc supports the GNU_HASH | 5 | # The ld.so in this glibc supports the GNU_HASH |
6 | RPROVIDES:${PN} = "eglibc rtld(GNU_HASH)" | 6 | RPROVIDES:${PN} = "eglibc rtld(GNU_HASH)" |
@@ -23,12 +23,14 @@ ARCH_DYNAMIC_LOADER:aarch64 = "ld-linux-${TARGET_ARCH}.so.1" | |||
23 | libc_baselibs:append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" | 23 | libc_baselibs:append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" |
24 | INSANE_SKIP:${PN}:append:aarch64 = " libdir" | 24 | INSANE_SKIP:${PN}:append:aarch64 = " libdir" |
25 | INSANE_SKIP:${PN}-dev += "staticdev" | 25 | INSANE_SKIP:${PN}-dev += "staticdev" |
26 | INSANE_SKIP:${MLPREFIX}ldso:append = " dev-so libdir" | ||
26 | 27 | ||
27 | FILES:${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" | 28 | FILES:${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" |
28 | RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" | 29 | RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" |
29 | FILES:ldconfig = "${base_sbindir}/ldconfig" | 30 | FILES:ldconfig = "${base_sbindir}/ldconfig" |
30 | FILES:ldd = "${bindir}/ldd" | 31 | FILES:ldd = "${bindir}/ldd" |
31 | FILES:libsegfault = "${base_libdir}/libSegFault*" | 32 | FILES:libsegfault = "${base_libdir}/libSegFault*" |
33 | FILES:ldso = "${bindir}/${MLPREFIX}ld.so" | ||
32 | FILES:libmemusage = "${base_libdir}/libmemusage.so" | 34 | FILES:libmemusage = "${base_libdir}/libmemusage.so" |
33 | FILES:malloc-debug = "${base_libdir}/libc_malloc_debug.so.0" | 35 | FILES:malloc-debug = "${base_libdir}/libc_malloc_debug.so.0" |
34 | FILES:libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile ${localstatedir}/db/makedbs.sh" | 36 | FILES:libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile ${localstatedir}/db/makedbs.sh" |
@@ -121,6 +123,9 @@ do_install() { | |||
121 | fi | 123 | fi |
122 | ln -rs ${D}${base_libdir}/libpthread.so.0 ${D}${libdir}/libpthread.so | 124 | ln -rs ${D}${base_libdir}/libpthread.so.0 ${D}${libdir}/libpthread.so |
123 | ln -rs ${D}${base_libdir}/librt.so.1 ${D}${libdir}/librt.so | 125 | ln -rs ${D}${base_libdir}/librt.so.1 ${D}${libdir}/librt.so |
126 | if [ -n "${MLPREFIX}" ]; then | ||
127 | mv ${D}${bindir}/ld.so ${D}${bindir}/${MLPREFIX}ld.so | ||
128 | fi | ||
124 | } | 129 | } |
125 | 130 | ||
126 | def get_libc_fpu_setting(bb, d): | 131 | def get_libc_fpu_setting(bb, d): |