diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index f0fc9c1cc4..a674c23799 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -14,9 +14,6 @@ python __anonymous () { | |||
14 | d.getVar('TARGET_OS')) | 14 | d.getVar('TARGET_OS')) |
15 | } | 15 | } |
16 | 16 | ||
17 | # Set this to zero if you don't want ldconfig in the output package | ||
18 | USE_LDCONFIG ?= "1" | ||
19 | |||
20 | INHIBIT_SYSROOT_STRIP = "1" | 17 | INHIBIT_SYSROOT_STRIP = "1" |
21 | 18 | ||
22 | PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode ${PN}-utils glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" | 19 | PACKAGES = "${PN}-dbg catchsegv sln nscd ldd tzcode ${PN}-utils glibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc" |
@@ -37,7 +34,7 @@ libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${ba | |||
37 | libc_baselibs_append_aarch64 = " /lib/ld-linux-aarch64*.so.1" | 34 | libc_baselibs_append_aarch64 = " /lib/ld-linux-aarch64*.so.1" |
38 | INSANE_SKIP_${PN}_append_aarch64 = " libdir" | 35 | INSANE_SKIP_${PN}_append_aarch64 = " libdir" |
39 | 36 | ||
40 | FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}" | 37 | FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf" |
41 | FILES_ldd = "${bindir}/ldd" | 38 | FILES_ldd = "${bindir}/ldd" |
42 | FILES_libsegfault = "${base_libdir}/libSegFault*" | 39 | FILES_libsegfault = "${base_libdir}/libSegFault*" |
43 | FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" | 40 | FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" |
@@ -96,8 +93,8 @@ do_install_append () { | |||
96 | rm -f ${D}${infodir}/dir | 93 | rm -f ${D}${infodir}/dir |
97 | fi | 94 | fi |
98 | 95 | ||
99 | if [ "${USE_LDCONFIG}" != "1" ]; then | 96 | if ! ${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', 'true', 'false', d)}; then |
100 | # We won't ship these files (see FILES above) so let's not install them | 97 | # The distro doesn't want these files so let's not install them |
101 | rm -f ${D}${sysconfdir}/ld.so.conf | 98 | rm -f ${D}${sysconfdir}/ld.so.conf |
102 | rm -f ${D}${base_sbindir}/ldconfig | 99 | rm -f ${D}${base_sbindir}/ldconfig |
103 | # This directory will be empty now so remove it too. | 100 | # This directory will be empty now so remove it too. |