diff options
author | Denys Dmytriyenko <denys@konsulko.com> | 2024-01-22 14:19:02 -0500 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2024-01-22 14:34:08 -0600 |
commit | bdae918d9056ce8a7ad76567b1b521249dac5e46 (patch) | |
tree | 6810bf814e5e67799b9143d560ca9d7f7c58ff7c | |
parent | 86bafdd779a0a7a021369213a633125b95bc6178 (diff) | |
download | meta-ti-dunfell-next.tar.gz |
optee-os: restore libgcc-sysroot patch with newer versiondunfell-wipdunfell-nextdunfell
The patch was dropped with 3.17 update:
https://git.yoctoproject.org/meta-ti/commit/?h=dunfell&id=f8182afdcfe427865707077d353359827f1ff6bf
But the patch is still needed for internal OE-built toolchain to pass
sysroot, otherwise libgcc.a cannot be found:
| aarch64-oe-linux-ld.bfd: cannot find libgcc.a: No such file or directory
The older version from meta-arm/dunfell no longer applies, so copy a newer
version of the patch locally.
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r-- | recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch | 34 | ||||
-rw-r--r-- | recipes-security/optee/optee-os_%.bbappend | 6 |
2 files changed, 39 insertions, 1 deletions
diff --git a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch new file mode 100644 index 00000000..1698c904 --- /dev/null +++ b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Tue, 26 May 2020 14:38:02 -0500 | ||
4 | Subject: [PATCH] allow setting sysroot for libgcc lookup | ||
5 | |||
6 | Explicitly pass the new variable LIBGCC_LOCATE_CFLAGS variable when searching | ||
7 | for the compiler libraries as there's no easy way to reliably pass --sysroot | ||
8 | otherwise. | ||
9 | |||
10 | Upstream-Status: Pending [https://github.com/OP-TEE/optee_os/issues/4188] | ||
11 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
12 | --- | ||
13 | mk/gcc.mk | 6 +++--- | ||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/mk/gcc.mk b/mk/gcc.mk | ||
17 | index adc77a24..81bfa78a 100644 | ||
18 | --- a/mk/gcc.mk | ||
19 | +++ b/mk/gcc.mk | ||
20 | @@ -13,11 +13,11 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \ | ||
21 | -print-file-name=include 2> /dev/null) | ||
22 | |||
23 | # Get location of libgcc from gcc | ||
24 | -libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \ | ||
25 | +libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \ | ||
26 | -print-libgcc-file-name 2> /dev/null) | ||
27 | -libstdc++$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ | ||
28 | +libstdc++$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ | ||
29 | -print-file-name=libstdc++.a 2> /dev/null) | ||
30 | -libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ | ||
31 | +libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \ | ||
32 | -print-file-name=libgcc_eh.a 2> /dev/null) | ||
33 | |||
34 | # Define these to something to discover accidental use | ||
diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend index ddfc76f1..ebcf584d 100644 --- a/recipes-security/optee/optee-os_%.bbappend +++ b/recipes-security/optee/optee-os_%.bbappend | |||
@@ -1,6 +1,10 @@ | |||
1 | FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" | ||
2 | |||
1 | PV_ti-soc = "3.20.0+git${SRCPV}" | 3 | PV_ti-soc = "3.20.0+git${SRCPV}" |
2 | SRCREV_ti-soc = "8e74d47616a20eaa23ca692f4bbbf917a236ed94" | 4 | SRCREV_ti-soc = "8e74d47616a20eaa23ca692f4bbbf917a236ed94" |
3 | SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https" | 5 | SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https \ |
6 | file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ | ||
7 | " | ||
4 | 8 | ||
5 | DEPENDS_append_ti-soc = " python3-cryptography-native" | 9 | DEPENDS_append_ti-soc = " python3-cryptography-native" |
6 | 10 | ||