From: Yannick Gicquel <yannick.gicquel@iot.bzh>
Date: Thu, 17 Nov 2016 15:36:09 +0000 (+0100)
Subject: meta-rcar-gen3: optee-os: build fixup
X-Git-Tag: chinook_3.0.0~56
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=769c7390c61512b61b3e231b020e03daaffa7f0a;p=AGL%2Fmeta-agl.git

meta-rcar-gen3: optee-os: build fixup

Change-Id: I47dcf04e05ec61eebff20a171df78584c7de70a1
Signed-off-by: Yannick Gicquel <yannick.gicquel@iot.bzh>
---

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 \
+"