From: Ronan Le Martret Date: Fri, 24 Feb 2017 09:36:48 +0000 (+0100) Subject: [rcar-gen3] Remove fix on optee X-Git-Tag: 3.99.1~133 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=8d8aacf0b00ec1ce8911e9750aa1015664a22433;hp=9adc57c2db5a924d6372a1232c37635a621fc0e7;p=AGL%2Fmeta-agl.git [rcar-gen3] Remove fix on optee * the new version of optee from Renesas rcar gen3 v2.16, doesn't need this fix to build anymore. Bug-AGL: SPEC-471 Change-Id: I8869b13bf038e2cd2f45a26affadd757fe1ea10c Signed-off-by: Ronan Le Martret --- 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 deleted file mode 100644 index 3a618904a..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/optee/optee-os/0001-disable-libgcc-detection.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 4845dda22..591f15d84 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 @@ -5,6 +5,4 @@ DEPENDS += " python-pycrypto-native" #Need for gcc 6.2 CFLAGS += " -fno-strict-aliasing -Wno-unused-variable -Wno-shift-negative-value" -SRC_URI += " \ - file://0001-disable-libgcc-detection.patch \ -" +