From patchwork Tue Jan 3 06:19:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 053/113] eglibc: Only add eglibc-utils to PACKAGES if wchar is supported Date: Tue, 03 Jan 2012 06:19:39 -0000 From: Saul Wold X-Patchwork-Id: 18071 Message-Id: <8c603e5fe18d1bc4c10bf10662caaaa0ac5aa335.1325571069.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Darren Hart eglibc-utils RDEPENDS on bash which requires gettext which requires wchar support. If wchar support is not included in DISTRO_FEATURES, gettext will fail to compile. By removing eglibc-utils from the PACKAGES listing, bitbake doesn't try to build the dependency chain. Signed-off-by: Darren Hart --- meta/recipes-core/eglibc/eglibc-package.inc | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 020f558..ab62654 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -20,7 +20,11 @@ USE_LDCONFIG ?= "1" PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk" -PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} ${PN}-utils eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}" +PACKAGES = "${PN}-dbg ${PN} catchsegv${PKGSUFFIX} sln${PKGSUFFIX} nscd${PKGSUFFIX} ldd${PKGSUFFIX} eglibc-extra-nss${PKGSUFFIX} eglibc-thread-db${PKGSUFFIX} ${PN}-pic ${PN}-dev ${PN}-doc libcidn${PKGSUFFIX} libmemusage${PKGSUFFIX} libsegfault${PKGSUFFIX} ${PN}-pcprofile libsotruss${PKGSUFFIX}" + +# eglibc-utils rdepends on bash which depends on gettext which requires wchar +# support. Only include it in the PACKAGES list if we can build the RDEPENDS. +PACKAGES += ${@base_contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', '${PN}-utils', '', d)} # The ld.so in this eglibc supports the GNU_HASH RPROVIDES_${PN} = "glibc${PKGSUFFIX} rtld(GNU_HASH)"