diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-12-03 14:37:20 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-18 14:20:19 +0000 |
commit | 996448e2f4b1ae81d9df618ceca382c5eee991ad (patch) | |
tree | fb8e04f408a1923a6039e12662b3b6267495e625 /meta | |
parent | 4d6c5efbb9e6e19bfc8ba17433e7190a3e37eb06 (diff) | |
download | poky-996448e2f4b1ae81d9df618ceca382c5eee991ad.tar.gz |
ruby: fix reproducibility
(From OE-Core rev: d2619ca71a777ae4fd0ecb4340848ef98282a9ad)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 07c26e3292dbaf71873f71bec2a631f880b2e76d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/ruby/ruby_2.7.1.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch b/meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch new file mode 100644 index 0000000000..826daf2cda --- /dev/null +++ b/meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 2368d07660a93a2c41d63f3ab6054ca4daeef820 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 17 Nov 2020 18:31:40 +0000 | ||
4 | Subject: [PATCH] template/Makefile.in: do not write host cross-cc items into | ||
5 | target config | ||
6 | |||
7 | This helps reproducibility. | ||
8 | |||
9 | Upstream-Status: Inapproppriate [oe-core specific] | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | template/Makefile.in | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/template/Makefile.in b/template/Makefile.in | ||
16 | index 10dc826..940ee07 100644 | ||
17 | --- a/template/Makefile.in | ||
18 | +++ b/template/Makefile.in | ||
19 | @@ -657,11 +657,11 @@ mjit_config.h: | ||
20 | echo '#endif'; \ | ||
21 | quote MJIT_MIN_HEADER_NAME "$(MJIT_MIN_HEADER_NAME)"; \ | ||
22 | sep=,; \ | ||
23 | - quote "MJIT_CC_COMMON " $(MJIT_CC); \ | ||
24 | + quote "MJIT_CC_COMMON " ; \ | ||
25 | quote "MJIT_CFLAGS MJIT_ARCHFLAG" $(MJIT_CFLAGS); \ | ||
26 | quote "MJIT_OPTFLAGS " $(MJIT_OPTFLAGS); \ | ||
27 | quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \ | ||
28 | - quote "MJIT_LDSHARED " $(MJIT_LDSHARED); \ | ||
29 | + quote "MJIT_LDSHARED " ; \ | ||
30 | quote "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \ | ||
31 | quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \ | ||
32 | quote 'PRELOADENV "@PRELOADENV@"'; \ | ||
diff --git a/meta/recipes-devtools/ruby/ruby_2.7.1.bb b/meta/recipes-devtools/ruby/ruby_2.7.1.bb index f87686f6f7..a6c65e887b 100644 --- a/meta/recipes-devtools/ruby/ruby_2.7.1.bb +++ b/meta/recipes-devtools/ruby/ruby_2.7.1.bb | |||
@@ -7,6 +7,7 @@ SRC_URI += " \ | |||
7 | file://run-ptest \ | 7 | file://run-ptest \ |
8 | file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ | 8 | file://0001-Modify-shebang-of-libexec-y2racc-and-libexec-racc2y.patch \ |
9 | file://CVE-2020-25613.patch \ | 9 | file://CVE-2020-25613.patch \ |
10 | file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \ | ||
10 | " | 11 | " |
11 | 12 | ||
12 | SRC_URI[md5sum] = "debb9c325bf65021214451660f46e909" | 13 | SRC_URI[md5sum] = "debb9c325bf65021214451660f46e909" |