diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-07-10 21:54:22 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-14 23:44:33 +0200 |
commit | 15266c135acec3efdd4dfa1b504a266b5efcbf6b (patch) | |
tree | 445fdb48856813fbefb04493a5862c1d27422876 /meta-initramfs/recipes-devtools/klibc/klibc.inc | |
parent | 592e9f26cca4944adf4e534af5794680f07d098c (diff) | |
download | meta-openembedded-15266c135acec3efdd4dfa1b504a266b5efcbf6b.tar.gz |
klibc: Fix build with musl
klibc failed to build with armv7+ when using thumb2
it needed to resepct TUNE_CCARGS
Add patches to fix build with musl, to sort out
the linux header maze.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-initramfs/recipes-devtools/klibc/klibc.inc')
-rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc.inc | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index e039cb2c1..be59aa443 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc | |||
@@ -7,17 +7,23 @@ LIC_FILES_CHKSUM = "file://usr/klibc/LICENSE;md5=d75181f10e998c21eb147f6d2e43ce8 | |||
7 | DEPENDS = "linux-libc-headers perl-native" | 7 | DEPENDS = "linux-libc-headers perl-native" |
8 | SRCREV = "4d19974d7020488f63651244e1f9f51727c3f66c" | 8 | SRCREV = "4d19974d7020488f63651244e1f9f51727c3f66c" |
9 | 9 | ||
10 | SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git" | 10 | SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git \ |
11 | SRC_URI_append_linux-gnueabi = " file://klibc-config-eabi.patch \ | 11 | ${ARMPATCHES} \ |
12 | file://armv4-fix-v4bx.patch \ | 12 | file://klibc-linux-libc-dev.patch \ |
13 | " | 13 | file://staging.patch \ |
14 | SRC_URI_append_linux-uclibceabi = " file://klibc-config-eabi.patch \ | 14 | file://klcc-consider-sysroot.patch \ |
15 | file://armv4-fix-v4bx.patch \ | 15 | file://0001-dash-Specify-format-string-in-fmtstr.patch \ |
16 | " | 16 | file://0001-Define-in_-structs-for-non-glibc-system-libs.patch \ |
17 | SRC_URI += "file://klibc-linux-libc-dev.patch \ | 17 | file://0001-include-linux-sysinfo.h-directly.patch \ |
18 | file://staging.patch \ | 18 | file://0001-mkfifo-Implement-mkfifo.patch \ |
19 | file://klcc-consider-sysroot.patch \ | 19 | " |
20 | " | 20 | |
21 | ARMPATCHES ?= "" | ||
22 | |||
23 | ARMPATCHES_arm = "file://klibc-config-eabi.patch \ | ||
24 | file://armv4-fix-v4bx.patch \ | ||
25 | " | ||
26 | |||
21 | 27 | ||
22 | S = "${WORKDIR}/git" | 28 | S = "${WORKDIR}/git" |
23 | 29 | ||
@@ -30,9 +36,12 @@ EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ | |||
30 | 'INSTALLROOT=${D}' \ | 36 | 'INSTALLROOT=${D}' \ |
31 | 'INSTALLDIR=${libdir}/klibc' \ | 37 | 'INSTALLDIR=${libdir}/klibc' \ |
32 | 'SHLIBDIR=${libdir}' \ | 38 | 'SHLIBDIR=${libdir}' \ |
39 | '${KLIBCTHUMB}' \ | ||
40 | 'KLIBCOPTFLAGS=${TUNE_CCARGS}' \ | ||
33 | " | 41 | " |
34 | 42 | ||
35 | export FIX_ARMV4_EABI_BX = "${FIX_V4BX}" | 43 | export FIX_ARMV4_EABI_BX = "${FIX_V4BX}" |
44 | KLIBCTHUMB = "${@['', 'CONFIG_KLIBC_THUMB=y'][(d.getVar('ARM_INSTRUCTION_SET') == 'thumb')]}" | ||
36 | 45 | ||
37 | do_configure () { | 46 | do_configure () { |
38 | ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux | 47 | ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux |
@@ -51,3 +60,6 @@ KLIBC_ARCH_x86-64 = "x86_64" | |||
51 | KLIBC_ARCH_powerpc = "ppc" | 60 | KLIBC_ARCH_powerpc = "ppc" |
52 | KLIBC_ARCH_powerpc64 = "ppc64" | 61 | KLIBC_ARCH_powerpc64 = "ppc64" |
53 | THIS_LIBKLIBC = "libklibc (= ${PV}-${PR})" | 62 | THIS_LIBKLIBC = "libklibc (= ${PV}-${PR})" |
63 | |||
64 | SECURITY_CFLAGS = "-fno-PIE -no-pie" | ||
65 | SECURITY_LDFLAGS = "-no-pie" | ||