summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch17
1 files changed, 8 insertions, 9 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 949c788344..003cfbc8d8 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
@@ -25,16 +25,19 @@ Signed-off-by: Martin Hundebøll <martin@geanix.com>
25Update to fix buildpaths qa issue for '-fmacro-prefix-map'. 25Update to fix buildpaths qa issue for '-fmacro-prefix-map'.
26 26
27Signed-off-by: Kai Kang <kai.kang@windriver.com> 27Signed-off-by: Kai Kang <kai.kang@windriver.com>
28
29Update to fix buildpaths qa issue for '-ffile-prefix-map'.
30
31Signed-off-by: Khem Raj <raj.khem@gmail.com>
32
28--- 33---
29 Configurations/unix-Makefile.tmpl | 10 +++++++++- 34 Configurations/unix-Makefile.tmpl | 10 +++++++++-
30 crypto/build.info | 2 +- 35 crypto/build.info | 2 +-
31 2 files changed, 10 insertions(+), 2 deletions(-) 36 2 files changed, 10 insertions(+), 2 deletions(-)
32 37
33diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
34index 16af4d2087..54c162784c 100644
35--- a/Configurations/unix-Makefile.tmpl 38--- a/Configurations/unix-Makefile.tmpl
36+++ b/Configurations/unix-Makefile.tmpl 39+++ b/Configurations/unix-Makefile.tmpl
37@@ -317,13 +317,22 @@ BIN_LDFLAGS={- join(' ', $target{bin_lflags} || (), 40@@ -420,13 +420,23 @@ BIN_LDFLAGS={- join(' ', $target{bin_lfl
38 '$(CNF_LDFLAGS)', '$(LDFLAGS)') -} 41 '$(CNF_LDFLAGS)', '$(LDFLAGS)') -}
39 BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS) 42 BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS)
40 43
@@ -49,6 +52,7 @@ index 16af4d2087..54c162784c 100644
49+CFLAGS_Q={- for (@{$config{CFLAGS}}) { 52+CFLAGS_Q={- for (@{$config{CFLAGS}}) {
50+ s|-fdebug-prefix-map=[^ ]+|-fdebug-prefix-map=|g; 53+ s|-fdebug-prefix-map=[^ ]+|-fdebug-prefix-map=|g;
51+ s|-fmacro-prefix-map=[^ ]+|-fmacro-prefix-map=|g; 54+ s|-fmacro-prefix-map=[^ ]+|-fmacro-prefix-map=|g;
55+ s|-ffile-prefix-map=[^ ]+|-ffile-prefix-map=|g;
52+ } 56+ }
53+ join(' ', @{$config{CFLAGS}}) -} 57+ join(' ', @{$config{CFLAGS}}) -}
54+ 58+
@@ -58,11 +62,9 @@ index 16af4d2087..54c162784c 100644
58 PERLASM_SCHEME= {- $target{perlasm_scheme} -} 62 PERLASM_SCHEME= {- $target{perlasm_scheme} -}
59 63
60 # For x86 assembler: Set PROCESSOR to 386 if you want to support 64 # For x86 assembler: Set PROCESSOR to 386 if you want to support
61diff --git a/crypto/build.info b/crypto/build.info
62index b515b7318e..8c9cee2a09 100644
63--- a/crypto/build.info 65--- a/crypto/build.info
64+++ b/crypto/build.info 66+++ b/crypto/build.info
65@@ -10,7 +10,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \ 67@@ -10,7 +10,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink
66 ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl 68 ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl
67 69
68 DEPEND[cversion.o]=buildinf.h 70 DEPEND[cversion.o]=buildinf.h
@@ -71,6 +73,3 @@ index b515b7318e..8c9cee2a09 100644
71 DEPEND[buildinf.h]=../configdata.pm 73 DEPEND[buildinf.h]=../configdata.pm
72 74
73 GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME) 75 GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME)
74--
752.19.1
76