From 8156f9f9966ce41147227f070843f4d38b791231 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Fri, 21 Apr 2017 15:54:12 +0200
Subject: Fix optee-client build by adding the missing LDFLAGS statement in the
 makefile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Honour the LDFLAGS also in the libteec and tee-supplicant.

Fixes:

ERROR: optee-client-1.1.0+renesas+gitAUTOINC+db9c64d458-r0 do_package_qa:
QA Issue: No GNU_HASH in the elf binary: /usr/bin/tee-supplicant' [ldflags]

Bug-AGL: SPEC-509

Change-Id: I6cb4f2f6c54945ef24a7ff72441c6d91b999b9a4
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 ...LDFLAGS-also-in-the-libteec-and-tee-suppl.patch | 47 ++++++++++++++++++++++
 .../recipes-bsp/optee/optee-client_git.bb          |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Honour-the-LDFLAGS-also-in-the-libteec-and-tee-suppl.patch

(limited to 'meta-rcar-gen3')

diff --git a/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Honour-the-LDFLAGS-also-in-the-libteec-and-tee-suppl.patch b/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Honour-the-LDFLAGS-also-in-the-libteec-and-tee-suppl.patch
new file mode 100644
index 0000000..5cc7bbf
--- /dev/null
+++ b/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Honour-the-LDFLAGS-also-in-the-libteec-and-tee-suppl.patch
@@ -0,0 +1,47 @@
+From 1d176bf51a0f44a7f71ee05da67508e54b137d3f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan-Simon=20M=C3=B6ller?= <jsmoeller@linuxfoundation.org>
+Date: Fri, 21 Apr 2017 12:45:51 +0200
+Subject: [PATCH] Honour the LDFLAGS also in the libteec and tee-supplicant.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+ERROR: optee-client-1.1.0+renesas+gitAUTOINC+db9c64d458-r0 do_package_qa:
+QA Issue: No GNU_HASH in the elf binary: /usr/bin/tee-supplicant' [ldflags]
+
+Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
+---
+ libteec/Makefile        | 2 +-
+ tee-supplicant/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libteec/Makefile b/libteec/Makefile
+index 66055a7..f75c55d 100644
+--- a/libteec/Makefile
++++ b/libteec/Makefile
+@@ -29,7 +29,7 @@ TEEC_CFLAGS	:= $(addprefix -I, $(TEEC_INCLUDES)) $(CFLAGS) -D_GNU_SOURCE \
+ 		   -DDEBUGLEVEL_$(CFG_TEE_CLIENT_LOG_LEVEL) \
+ 		   -DBINARY_PREFIX=\"TEEC\"
+ 
+-TEEC_LFLAGS    := -lpthread
++TEEC_LFLAGS    := -lpthread $(LDFLAGS)
+ TEEC_LIBRARY	:= $(OUT_DIR)/$(LIB_MAJ_MIN)
+ 
+ libteec: $(TEEC_LIBRARY)
+diff --git a/tee-supplicant/Makefile b/tee-supplicant/Makefile
+index 204273f..33bcc58 100644
+--- a/tee-supplicant/Makefile
++++ b/tee-supplicant/Makefile
+@@ -57,7 +57,7 @@ ifeq ($(CFG_TA_TEST_PATH),y)
+ TEES_CFLAGS	+= -DCFG_TA_TEST_PATH=1
+ endif
+ TEES_FILE	:= $(OUT_DIR)/$(PACKAGE_NAME)
+-TEES_LDFLAGS    := -L$(OUT_DIR)/../libteec -lteec
++TEES_LDFLAGS    := -L$(OUT_DIR)/../libteec -lteec $(LDFLAGS)
+ 
+ ifeq ($(CFG_SQL_FS),y)
+ TEES_CFLAGS	+= -DCFG_SQL_FS
+-- 
+2.12.0
+
diff --git a/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb b/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb
index 9efbfb5..7bf6b09 100644
--- a/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb
+++ b/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb
@@ -10,6 +10,7 @@ SRCREV = "db9c64d45818d146200297eaaedbd421a8b59e3a"
 
 SRC_URI += " \
     file://optee.service \
+    file://0001-Honour-the-LDFLAGS-also-in-the-libteec-and-tee-suppl.patch \
 "
 
 inherit systemd
-- 
cgit 1.2.3-korg