From ded63d68334044e79b15b814216fab02c70ad94f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 18 Dec 2018 20:01:26 +0000 Subject: glibc: Remove site_config and glibc-initial The only reason we appear to need glibc-initial at this time is to support the site_config code. The site_config code compiles and therefore needs at least some level of working C library to link against. This isn't a good reason to keep the complexity of glibc-initial around so remove it, and the site_config support which then breaks. Performance benchmarks suggest the time spent just rerunning configure for site_config just about equals any performance benefit for OE-Core image builds excluding the time spent adding glibc-initial to the dependency chain. I'm not opposed to readding some other form of site_config support but it needs to be rethought. (From OE-Core rev: c5df105e7583e43da9b682f739bebaf873dcd2f4) Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc.inc | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'meta/recipes-core/glibc/glibc.inc') diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 99c92ce46e..43e71337ee 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -15,21 +15,7 @@ python () { bb.fatal("%s can't be built with %s, try -O1 instead" % (d.getVar('PN'), opt_effective)) } -# siteconfig.bbclass runs configure which needs a working compiler -# For the compiler to work we need a working libc yet libc isn't -# in the sysroots directory at this point. This means the libc.so -# linker script won't work as the --sysroot setting isn't correct. -# Here we create a hacked up libc linker script and pass in the right -# flags to let configure work. Ugly. -EXTRASITECONFIG = "CFLAGS='${CFLAGS} -Wl,-L${WORKDIR}/site_config_libc -L${WORKDIR}/site_config_libc -L${SYSROOT_DESTDIR}${libdir} -L${SYSROOT_DESTDIR}${base_libdir} -Wl,-L${SYSROOT_DESTDIR}${libdir} -Wl,-L${SYSROOT_DESTDIR}${base_libdir}'" -siteconfig_do_siteconfig_gencache_prepend = " \ - mkdir -p ${WORKDIR}/site_config_libc; \ - cp ${SYSROOT_DESTDIR}${libdir}/libc.so ${WORKDIR}/site_config_libc; \ - sed -i -e 's# ${base_libdir}# ${SYSROOT_DESTDIR}${base_libdir}#g' -e 's# ${libdir}# ${SYSROOT_DESTDIR}${libdir}#g' ${WORKDIR}/site_config_libc/libc.so; \ -" - -# nptl needs unwind support in gcc, which can't be built without glibc. -DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial libgcc-initial linux-libc-headers virtual/${TARGET_PREFIX}libc-initial" +DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial libgcc-initial linux-libc-headers" PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "virtual/libintl virtual/libiconv" -- cgit v1.2.3-54-g00ecf