From c332ab143f64053187e75e001c8a005e142bfe9e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 13 Mar 2021 23:44:35 -0800 Subject: kexec-tools-klibc: Use SITEINFO_BITS to construct includepath This helps getting rid of per arch overrides Signed-off-by: Khem Raj --- .../recipes-kernel/kexec/kexec-tools-klibc_git.bb | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'meta-initramfs/recipes-kernel') diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb index c49b24f52..656162fb1 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb @@ -10,7 +10,7 @@ PV = "2.0.18+git${SRCPV}" DEPENDS = "zlib xz" -inherit klibc autotools +inherit klibc autotools siteinfo SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" SRCREV = "5750980cdbbc33ef75bfba6660295b932376ce15" @@ -66,17 +66,8 @@ EXTRA_OECONF += "--without-zlib --without-lzma --without-xen" # fix purgatory/printf.c:2:10: fatal error: limits.h: No such file or directory # fix include/limits.h:42:10: fatal error: bitsize/limits.h: No such file or directory -COMMON_CFLAGS += "-O2 -I${STAGING_DIR_HOST}${libdir}/klibc/include -I${S}/purgatory/include" -CFLAGS_x86_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" -CFLAGS_x86-64_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64" -CFLAGS_arm_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" -CFLAGS_aarch64_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64" -CFLAGS_mips_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" -CFLAGS_mipsel_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" -CFLAGS_mips64_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64" -CFLAGS_mips64el_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits64" -CFLAGS_powerpc_append = " ${COMMON_CFLAGS} -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits32" - +CFLAGS += "-O2 -I${STAGING_DIR_HOST}${libdir}/klibc/include -I${S}/purgatory/include \ + -I${STAGING_DIR_HOST}${libdir}/klibc/include/bits${SITEINFO_BITS}" do_compile_prepend() { # Remove the prepackaged config.h from the source tree as it overrides -- cgit v1.2.3-54-g00ecf