From 769c7390c61512b61b3e231b020e03daaffa7f0a Mon Sep 17 00:00:00 2001 From: Yannick Gicquel Date: Thu, 17 Nov 2016 16:36:09 +0100 Subject: [PATCH 1/1] meta-rcar-gen3: optee-os: build fixup Change-Id: I47dcf04e05ec61eebff20a171df78584c7de70a1 Signed-off-by: Yannick Gicquel --- .../optee/optee-os/0001-disable-libgcc-detection.patch | 15 +++++++++++++++ .../recipes-bsp/optee/optee-os_git.bbappend | 12 ++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/0001-disable-libgcc-detection.patch diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/0001-disable-libgcc-detection.patch b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/0001-disable-libgcc-detection.patch new file mode 100644 index 000000000..3a618904a --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/0001-disable-libgcc-detection.patch @@ -0,0 +1,15 @@ +diff --git a/mk/gcc.mk b/mk/gcc.mk +index 76ad125..1f5bb2e 100644 +--- a/mk/gcc.mk ++++ b/mk/gcc.mk +@@ -12,8 +12,8 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \ + -print-file-name=include 2> /dev/null) + + # Get location of libgcc from gcc +-libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) $(comp-cflags$(sm)) \ +- -print-libgcc-file-name 2> /dev/null) ++#libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) $(comp-cflags$(sm)) \ ++# -print-libgcc-file-name 2> /dev/null) + + # Define these to something to discover accidental use + CC := false diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bbappend index ab6f23dc5..90d6717ab 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bbappend @@ -1,9 +1,5 @@ -COMPATIBLE_MACHINE = "(salvator-x|h3ulcb|m3ulcb)" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -do_compile() { - : -} - -do_deploy() { - : -} +SRC_URI += " \ + file://0001-disable-libgcc-detection.patch \ +" -- 2.16.6