[OE-core] [PATCH 2/4] eglibc: Only add eglibc-utils to PACKAGES if wchar is supported

[Koen Kooi]

Op 29 dec. 2011, om 00:38 heeft Darren Hart het volgende geschreven:

> 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.

What code in there actually depends on bash and can't we fix it to work with stock sh?

> 
> By removing eglibc-utils from the PACKAGES listing, bitbake doesn't
> try to build the dependency chain.
> 
> Signed-off-by: Darren Hart <dvhart at linux.intel.com>
> ---
> 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)"
> -- 
> 1.7.6.4
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 163 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20111229/67fd2269/attachment-0002.sig>