summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2019-02-14 21:06:38 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-15 16:05:37 +0000
commitbb7727c535c8dcff1f0c4f9eb65f9cbb7c74840d (patch)
treec949a776c2b718d9493b42389aa4337c3ff2994f
parent936eab2dab929544483d5ec3530de6c91f50484c (diff)
downloadpoky-bb7727c535c8dcff1f0c4f9eb65f9cbb7c74840d.tar.gz
openssl: update patch to fix buildpaths qa issue for -fmacro-prefix-map
Gcc option '-fmacro-prefix-map' is added to DEBUG_PREFIX_MAP. It has a patch to deal option '-fdebug-prefix-map' already. Update the patch 0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch to fix buildpaths qa issue for '-fmacro-prefix-map' too. (From OE-Core rev: 0851e03daebeeb7e0579baa3aa195c228652d97b) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch b/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch
index 80b62ab18c..949c788344 100644
--- a/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch
+++ b/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch
@@ -20,6 +20,11 @@ https://patchwork.openembedded.org/patch/147229/
20 20
21Upstream-Status: Inappropriate [OE specific] 21Upstream-Status: Inappropriate [OE specific]
22Signed-off-by: Martin Hundebøll <martin@geanix.com> 22Signed-off-by: Martin Hundebøll <martin@geanix.com>
23
24
25Update to fix buildpaths qa issue for '-fmacro-prefix-map'.
26
27Signed-off-by: Kai Kang <kai.kang@windriver.com>
23--- 28---
24 Configurations/unix-Makefile.tmpl | 10 +++++++++- 29 Configurations/unix-Makefile.tmpl | 10 +++++++++-
25 crypto/build.info | 2 +- 30 crypto/build.info | 2 +-
@@ -29,7 +34,7 @@ diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tm
29index 16af4d2087..54c162784c 100644 34index 16af4d2087..54c162784c 100644
30--- a/Configurations/unix-Makefile.tmpl 35--- a/Configurations/unix-Makefile.tmpl
31+++ b/Configurations/unix-Makefile.tmpl 36+++ b/Configurations/unix-Makefile.tmpl
32@@ -317,13 +317,21 @@ BIN_LDFLAGS={- join(' ', $target{bin_lflags} || (), 37@@ -317,13 +317,22 @@ BIN_LDFLAGS={- join(' ', $target{bin_lflags} || (),
33 '$(CNF_LDFLAGS)', '$(LDFLAGS)') -} 38 '$(CNF_LDFLAGS)', '$(LDFLAGS)') -}
34 BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS) 39 BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS)
35 40
@@ -43,6 +48,7 @@ index 16af4d2087..54c162784c 100644
43 48
44+CFLAGS_Q={- for (@{$config{CFLAGS}}) { 49+CFLAGS_Q={- for (@{$config{CFLAGS}}) {
45+ s|-fdebug-prefix-map=[^ ]+|-fdebug-prefix-map=|g; 50+ s|-fdebug-prefix-map=[^ ]+|-fdebug-prefix-map=|g;
51+ s|-fmacro-prefix-map=[^ ]+|-fmacro-prefix-map=|g;
46+ } 52+ }
47+ join(' ', @{$config{CFLAGS}}) -} 53+ join(' ', @{$config{CFLAGS}}) -}
48+ 54+