t-head/meta-external-toolchain
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-external-toolchain synced 2026-09-04 06:54:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

linux-libc-headers: merge back into glibc

Browse Source 
We don't want to encourage use of alternate versions of this recipe, there are
better ways to add additional headers.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
This commit is contained in:
Christopher Larson
2017-06-21 01:59:28 +05:00
parent 6160b16947
commit f7ea27eaf3
3 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
conf/distro/include/tcmode-external.inc
View File

@@ -18,10 +18,10 @@ PREFERRED_PROVIDER_virtual/libintl ?= "glibc-external"
PREFERRED_PROVIDER_virtual/libiconv ?= "glibc-external"
PREFERRED_PROVIDER_gdbserver ??= "gdbserver-external"
PREFERRED_PROVIDER_oprofile ??= "oprofile"
# These are defined in default-providers.inc, which is parsed before the
# tcmode, so we can't use ?= for them.
# This is defined in default-providers.inc, which is parsed before the tcmode,
# so we can't use ?=
PREFERRED_PROVIDER_libgcc = "libgcc-external"
PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers-external"
# Pass --no-sysroot-suffix when using an external toolchain with the SDK
TOOLCHAIN_TARGET_TASK_append = " sdk-env-external-toolchain"

8
recipes-external/glibc/glibc-external.bb
View File

@@ -10,8 +10,7 @@ require recipes-core/glibc/glibc-common.inc
inherit external-toolchain
require recipes-external/glibc/glibc-external-version.inc
DEPENDS += "virtual/${TARGET_PREFIX}binutils \
linux-libc-headers"
DEPENDS += "virtual/${TARGET_PREFIX}binutils"
PROVIDES += "glibc \
virtual/${TARGET_PREFIX}libc-for-gcc \
virtual/${TARGET_PREFIX}libc-initial \
@@ -143,8 +142,6 @@ python () {
# Undo the do_install_append which joined shell to python
install = d.getVar('do_install', False)
python, shell = install.split('rm -f ', 1)
# bits/syscall.h is in linux-libc-headers-external
shell = shell.replace('oe_multilib_header bits/syscall.h bits/long-double.h\n', '')
d.setVar('do_install_glibc', 'rm -f ' + shell)
d.setVarFlag('do_install_glibc', 'func', '1')
new_install = python + '\n bb.build.exec_func("do_install_glibc", d)\n'
@@ -187,6 +184,9 @@ FILES_${PN}-dev_remove := "${datadir}/aclocal"
FILES_${PN}-dev_remove = "/lib/*.o"
FILES_${PN}-dev += "${libdir}/*crt*.o"
linux_include_subdirs = "asm asm-generic bits drm linux mtd rdma sound sys video"
FILES_${PN}-dev += "${@' '.join('${includedir}/%s' % d for d in '${linux_include_subdirs}'.split())}"
libc_baselibs_dev += "${@' '.join('${libdir}/' + os.path.basename(l.replace('${SOLIBS}', '${SOLIBSDEV}')) for l in '${libc_baselibs}'.replace('${base_libdir}/ld*${SOLIBS}', '').split() if l.endswith('${SOLIBS}'))}"
FILES_${PN}-staticdev = "\
${@'${libc_baselibs_dev}'.replace('${SOLIBSDEV}', '.a')} \

20
recipes-external/linux-libc-headers/linux-libc-headers-external.bb
View File

@@ -1,20 +0,0 @@
require recipes-kernel/linux-libc-headers/linux-libc-headers.inc
inherit external-toolchain
LIC_FILES_CHKSUM = "${COMMON_LIC_CHKSUM}"
DEPENDS = ""
SRC_URI = ""
linux_include_subdirs = "asm asm-generic bits drm linux mtd rdma sound sys video"
FILES_${PN}-dev = "${@' '.join('${includedir}/%s' % d for d in '${linux_include_subdirs}'.split())}"
BBCLASSEXTEND = ""
inherit multilib_header
do_install_extra () {
oe_multilib_header bits/syscall.h
if [ -e "${D}${includedir}/bits/long-double.h" ]; then
oe_multilib_header bits/long-double.h
fi
}