optee-examples: Respect LDFLAGS passed via environment
PATCH v2 1/1 optee-examples: Respect LDFLAGS passed via environment
This ensures right linking flags e.g. gnu_hash settings
Signed-off-by Khem Raj <[email protected]>
---
v2: Improve patch commit message
.../0001-make-Pass-ldflags-during-link.patch | 103 ++++++++++++++++++ .../optee/optee-examples_git.bb | 4 +- 2 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-make-Pass-ldflags-during-link.patch
meta-arm/recipes-security/optee/optee-examples/0001-make-Pass-ldflags-during-link.patch new file +103 -0
@@ -0,0 +1,103 @@ +From 29ae21de41f2fbab6dbecbbf408826b28de82df1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 1 Sep 2020 21:09:56 -0700 +Subject: [PATCH] make: Pass ldflags during link + +OpenEmbeeded needs to pass essential linker flags to set correct flags +for gnu_hash among others which sets the linking straight +using LDFLAGS varible here means, we can affect the linker flags +from build environment + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + acipher/host/Makefile | 2 +- + aes/host/Makefile | 2 +- + hello_world/host/Makefile | 2 +- + hotp/host/Makefile | 2 +- + random/host/Makefile | 2 +- + secure_storage/host/Makefile | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/acipher/host/Makefile b/acipher/host/Makefile +index 8f4bc8a..c2cabef 100644 +--- a/acipher/host/Makefile ++++ b/acipher/host/Makefile +@@ -18,7 +18,7 @@ BINARY = optee_example_acipher + all: $(BINARY) + + $(BINARY): $(OBJS) +- $(CC) -o $@ $< $(LDADD) ++ $(CC) -o $@ $< $(LDFLAGS) $(LDADD) + + .PHONY: clean + clean: +diff --git a/aes/host/Makefile b/aes/host/Makefile +index dfeb4e8..f61c71b 100644 +--- a/aes/host/Makefile ++++ b/aes/host/Makefile +@@ -18,7 +18,7 @@ BINARY = optee_example_aes + all: $(BINARY) + + $(BINARY): $(OBJS) +- $(CC) -o $@ $< $(LDADD) ++ $(CC) -o $@ $< $(LDFLAGS) $(LDADD) + + .PHONY: clean + clean: +diff --git a/hello_world/host/Makefile b/hello_world/host/Makefile +index c4c8239..69cf42c 100644 +--- a/hello_world/host/Makefile ++++ b/hello_world/host/Makefile +@@ -18,7 +18,7 @@ BINARY = optee_example_hello_world + all: $(BINARY) + + $(BINARY): $(OBJS) +- $(CC) -o $@ $< $(LDADD) ++ $(CC) -o $@ $< $(LDFLAGS) $(LDADD) + + .PHONY: clean + clean: +diff --git a/hotp/host/Makefile b/hotp/host/Makefile +index cb7fd19..e7f013f 100644 +--- a/hotp/host/Makefile ++++ b/hotp/host/Makefile +@@ -18,7 +18,7 @@ BINARY = optee_example_hotp + all: $(BINARY) + + $(BINARY): $(OBJS) +- $(CC) -o $@ $< $(LDADD) ++ $(CC) -o $@ $< $(LDFLAGS) $(LDADD) + + .PHONY: clean + clean: +diff --git a/random/host/Makefile b/random/host/Makefile +index fd407d9..9377f7a 100644 +--- a/random/host/Makefile ++++ b/random/host/Makefile +@@ -18,7 +18,7 @@ BINARY = optee_example_random + all: $(BINARY) + + $(BINARY): $(OBJS) +- $(CC) -o $@ $< $(LDADD) ++ $(CC) -o $@ $< $(LDFLAGS) $(LDADD) + + .PHONY: clean + clean: +diff --git a/secure_storage/host/Makefile b/secure_storage/host/Makefile +index 29bfb87..b3265ae 100644 +--- a/secure_storage/host/Makefile ++++ b/secure_storage/host/Makefile +@@ -18,7 +18,7 @@ BINARY = optee_example_secure_storage + all: $(BINARY) + + $(BINARY): $(OBJS) +- $(CC) -o $@ $< $(LDADD) ++ $(CC) -o $@ $< $(LDFLAGS) $(LDADD) + + .PHONY: clean + clean: +-- +2.28.0 +
meta-arm/recipes-security/optee/optee-examples_git.bb +3 -1
@@ -13,7 +13,9 @@ inherit python3native require optee.inc -SRC_URI = "git://github.com/linaro-swg/optee_examples.git" +SRC_URI = "git://github.com/linaro-swg/optee_examples.git \ + file://0001-make-Pass-ldflags-during-link.patch \ + " SRCREV = "559b2141c16bf0f57ccd72f60e4deb84fc2a05b0" S = "${WORKDIR}/git"
Signature · 1 line
2.28.0
Quoted 3 lines · Khem Raj
This ensures right linking flags e.g.
gnu_hashsettingsSigned-off-by Khem Raj <[email protected]>
Pulled into master.
Thanks,
Jon
Quoted 137 lines
---
v2: Improve patch commit message.../0001-make-Pass-ldflags-during-link.patch | 103 ++++++++++++++++++ .../optee/optee-examples_git.bb | 4 +- 2 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 meta-arm/recipes-security/optee/optee-examples/0001-make-Pass-ldflags-during-link.patchmeta-arm/recipes-security/optee/optee-examples/0001-make-Pass-ldflags-during-link.patch new file +103
-0@@ -0,0 +1,103 @@ +From 29ae21de41f2fbab6dbecbbf408826b28de82df1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 1 Sep 2020 21:09:56 -0700 +Subject: [PATCH] make: Pass ldflags during link + +OpenEmbeeded needs to pass essential linker flags to set correct flags +for gnu_hash among others which sets the linking straight +using LDFLAGS varible here means, we can affect the linker flags +from build environment + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <[email protected]> +--- + acipher/host/Makefile | 2 +- + aes/host/Makefile | 2 +- + hello_world/host/Makefile | 2 +- + hotp/host/Makefile | 2 +- + random/host/Makefile | 2 +- + secure_storage/host/Makefile | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/acipher/host/Makefile b/acipher/host/Makefile +index 8f4bc8a..c2cabef 100644 +--- a/acipher/host/Makefile ++++ b/acipher/host/Makefile +@@ -18,7 +18,7 @@ BINARY = optee_example_acipher + all: $(BINARY) + + $(BINARY): $(OBJS) +- $(CC) -o $@ $< $(LDADD) ++ $(CC) -o $@ $< $(LDFLAGS) $(LDADD) + + .PHONY: clean + clean: +diff --git a/aes/host/Makefile b/aes/host/Makefile +index dfeb4e8..f61c71b 100644 +--- a/aes/host/Makefile ++++ b/aes/host/Makefile +@@ -18,7 +18,7 @@ BINARY = optee_example_aes + all: $(BINARY) + + $(BINARY): $(OBJS) +- $(CC) -o $@ $< $(LDADD) ++ $(CC) -o $@ $< $(LDFLAGS) $(LDADD) + + .PHONY: clean + clean: +diff --git a/hello_world/host/Makefile b/hello_world/host/Makefile +index c4c8239..69cf42c 100644 +--- a/hello_world/host/Makefile ++++ b/hello_world/host/Makefile +@@ -18,7 +18,7 @@ BINARY = optee_example_hello_world + all: $(BINARY) + + $(BINARY): $(OBJS) +- $(CC) -o $@ $< $(LDADD) ++ $(CC) -o $@ $< $(LDFLAGS) $(LDADD) + + .PHONY: clean + clean: +diff --git a/hotp/host/Makefile b/hotp/host/Makefile +index cb7fd19..e7f013f 100644 +--- a/hotp/host/Makefile ++++ b/hotp/host/Makefile +@@ -18,7 +18,7 @@ BINARY = optee_example_hotp + all: $(BINARY) + + $(BINARY): $(OBJS) +- $(CC) -o $@ $< $(LDADD) ++ $(CC) -o $@ $< $(LDFLAGS) $(LDADD) + + .PHONY: clean + clean: +diff --git a/random/host/Makefile b/random/host/Makefile +index fd407d9..9377f7a 100644 +--- a/random/host/Makefile ++++ b/random/host/Makefile +@@ -18,7 +18,7 @@ BINARY = optee_example_random + all: $(BINARY) + + $(BINARY): $(OBJS) +- $(CC) -o $@ $< $(LDADD) ++ $(CC) -o $@ $< $(LDFLAGS) $(LDADD) + + .PHONY: clean + clean: +diff --git a/secure_storage/host/Makefile b/secure_storage/host/Makefile +index 29bfb87..b3265ae 100644 +--- a/secure_storage/host/Makefile ++++ b/secure_storage/host/Makefile +@@ -18,7 +18,7 @@ BINARY = optee_example_secure_storage + all: $(BINARY) + + $(BINARY): $(OBJS) +- $(CC) -o $@ $< $(LDADD) ++ $(CC) -o $@ $< $(LDFLAGS) $(LDADD) + + .PHONY: clean + clean: +-- +2.28.0 +meta-arm/recipes-security/optee/optee-examples_git.bb +3
-1@@ -13,7 +13,9 @@ inherit python3native require optee.inc -SRC_URI = "git://github.com/linaro-swg/optee_examples.git" +SRC_URI = "git://github.com/linaro-swg/optee_examples.git \ + file://0001-make-Pass-ldflags-during-link.patch \ + " SRCREV = "559b2141c16bf0f57ccd72f60e4deb84fc2a05b0" S = "${WORKDIR}/git"Signature · 1 line
2.28.0