diff options
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch | 21 |
1 files changed, 12 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 003cfbc8d8..60890c666d 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3e1d00481093e10775eaf69d619c45b32a4aa7dc Mon Sep 17 00:00:00 2001 | 1 | From 5985253f2c9025d7c127443a3a9938946f80c2a1 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com> | 2 | From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com> |
3 | Date: Tue, 6 Nov 2018 14:50:47 +0100 | 3 | Date: Tue, 6 Nov 2018 14:50:47 +0100 |
4 | Subject: [PATCH] buildinfo: strip sysroot and debug-prefix-map from compiler | 4 | Subject: [PATCH] buildinfo: strip sysroot and debug-prefix-map from compiler |
@@ -21,7 +21,6 @@ https://patchwork.openembedded.org/patch/147229/ | |||
21 | Upstream-Status: Inappropriate [OE specific] | 21 | Upstream-Status: Inappropriate [OE specific] |
22 | Signed-off-by: Martin Hundebøll <martin@geanix.com> | 22 | Signed-off-by: Martin Hundebøll <martin@geanix.com> |
23 | 23 | ||
24 | |||
25 | Update to fix buildpaths qa issue for '-fmacro-prefix-map'. | 24 | Update to fix buildpaths qa issue for '-fmacro-prefix-map'. |
26 | 25 | ||
27 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 26 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
@@ -31,13 +30,15 @@ Update to fix buildpaths qa issue for '-ffile-prefix-map'. | |||
31 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 30 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
32 | 31 | ||
33 | --- | 32 | --- |
34 | Configurations/unix-Makefile.tmpl | 10 +++++++++- | 33 | Configurations/unix-Makefile.tmpl | 12 +++++++++++- |
35 | crypto/build.info | 2 +- | 34 | crypto/build.info | 2 +- |
36 | 2 files changed, 10 insertions(+), 2 deletions(-) | 35 | 2 files changed, 12 insertions(+), 2 deletions(-) |
37 | 36 | ||
37 | diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl | ||
38 | index f88a70f..528cdef 100644 | ||
38 | --- a/Configurations/unix-Makefile.tmpl | 39 | --- a/Configurations/unix-Makefile.tmpl |
39 | +++ b/Configurations/unix-Makefile.tmpl | 40 | +++ b/Configurations/unix-Makefile.tmpl |
40 | @@ -420,13 +420,23 @@ BIN_LDFLAGS={- join(' ', $target{bin_lfl | 41 | @@ -471,13 +471,23 @@ BIN_LDFLAGS={- join(' ', $target{bin_lflags} || (), |
41 | '$(CNF_LDFLAGS)', '$(LDFLAGS)') -} | 42 | '$(CNF_LDFLAGS)', '$(LDFLAGS)') -} |
42 | BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS) | 43 | BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS) |
43 | 44 | ||
@@ -62,14 +63,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
62 | PERLASM_SCHEME= {- $target{perlasm_scheme} -} | 63 | PERLASM_SCHEME= {- $target{perlasm_scheme} -} |
63 | 64 | ||
64 | # For x86 assembler: Set PROCESSOR to 386 if you want to support | 65 | # For x86 assembler: Set PROCESSOR to 386 if you want to support |
66 | diff --git a/crypto/build.info b/crypto/build.info | ||
67 | index efca6cc..eda433e 100644 | ||
65 | --- a/crypto/build.info | 68 | --- a/crypto/build.info |
66 | +++ b/crypto/build.info | 69 | +++ b/crypto/build.info |
67 | @@ -10,7 +10,7 @@ EXTRA= ../ms/uplink-x86.pl ../ms/uplink | 70 | @@ -109,7 +109,7 @@ DEFINE[../libcrypto]=$UPLINKDEF |
68 | ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl | ||
69 | 71 | ||
72 | DEPEND[info.o]=buildinf.h | ||
70 | DEPEND[cversion.o]=buildinf.h | 73 | DEPEND[cversion.o]=buildinf.h |
71 | -GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)" | 74 | -GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)" |
72 | +GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC_Q) $(CFLAGS_Q) $(CPPFLAGS_Q)" "$(PLATFORM)" | 75 | +GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC_Q) $(CFLAGS_Q) $(CPPFLAGS_Q)" "$(PLATFORM)" |
73 | DEPEND[buildinf.h]=../configdata.pm | ||
74 | 76 | ||
75 | GENERATE[uplink-x86.s]=../ms/uplink-x86.pl $(PERLASM_SCHEME) | 77 | GENERATE[uplink-x86.s]=../ms/uplink-x86.pl |
78 | GENERATE[uplink-x86_64.s]=../ms/uplink-x86_64.pl | ||