From: Richard Purdie <[email protected]> The current solutions to share uclibc, eglibc and glibc builds in the same tree all have various issues associated with them. Appending the suffix to TMPDIR seems like the best solution since sstate (which defaults to outside TMPDIR) will allow reuse of any components.
This avoids messy changes to the core with other approaches to this problem inevitably entail, usually in code where this abstraction isn;'t logically best placed. Signed-off-by: Richard Purdie <[email protected]> --- meta/conf/distro/defaultsetup.conf | 4 ++++ meta/conf/distro/include/tclibc-uclibc.inc | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf index 8da6c0a..e7636b4 100644 --- a/meta/conf/distro/defaultsetup.conf +++ b/meta/conf/distro/defaultsetup.conf @@ -14,6 +14,10 @@ require conf/distro/include/tcmode-${TCMODE}.inc TCLIBC ?= "eglibc" require conf/distro/include/tclibc-${TCLIBC}.inc +# Allow single libc distros to disable this code +TCLIBCAPPEND ?= "-${TCLIBC}" +TMPDIR_append = "${TCLIBCAPPEND}" + CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}" USER_CLASSES ?= "" diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc index 27f6ec6..83418d6 100644 --- a/meta/conf/distro/include/tclibc-uclibc.inc +++ b/meta/conf/distro/include/tclibc-uclibc.inc @@ -20,12 +20,6 @@ CXXFLAGS += "-fvisibility-inlines-hidden" IMAGE_LINGUAS = "" -DEPLOY_DIR_IMAGE = "${TMPDIR}/deploy/images" -DEPLOY_DIR_append = "-uclibc" -STAGING_DIR_TARGET_append = "-uclibc" -STAGING_DIR_HOST_append = "-uclibc" -SSTATE_MANIFESTS_append = "-uclibc" - LIBC_DEPENDENCIES = "\ uclibc \ uclibc-dbg \ -- 1.6.6.1 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
