summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/ccache
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-09 13:52:23 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-12 09:04:26 +0100
commit33ed48fb26ca99c0dfeb259a8ca52db53d74e7d1 (patch)
tree62ec24f26e5ad44d920dec6275b0b0f5a78d9f39 /meta/recipes-devtools/ccache
parent837c786d600ba697f8483a14088e24a562277a93 (diff)
downloadpoky-33ed48fb26ca99c0dfeb259a8ca52db53d74e7d1.tar.gz
ccache: upgrade 3.6 -> 3.7.1
Remove backported patches. Switch to new download location. (From OE-Core rev: 6e0f6a3433c314c870791ef75639a78c39a5f164) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/ccache')
-rw-r--r--meta/recipes-devtools/ccache/ccache.inc2
-rw-r--r--meta/recipes-devtools/ccache/ccache_3.6.bb12
-rw-r--r--meta/recipes-devtools/ccache/ccache_3.7.1.bb7
-rw-r--r--meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch30
-rw-r--r--meta/recipes-devtools/ccache/files/0003-Fix-Segmentation-fault-error-when-gcc-o-dev-null.patch79
5 files changed, 8 insertions, 122 deletions
diff --git a/meta/recipes-devtools/ccache/ccache.inc b/meta/recipes-devtools/ccache/ccache.inc
index 7f800659a3..a31acada57 100644
--- a/meta/recipes-devtools/ccache/ccache.inc
+++ b/meta/recipes-devtools/ccache/ccache.inc
@@ -9,7 +9,7 @@ LICENSE = "GPLv3+"
9 9
10DEPENDS = "zlib" 10DEPENDS = "zlib"
11 11
12SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz" 12SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz"
13 13
14inherit autotools 14inherit autotools
15 15
diff --git a/meta/recipes-devtools/ccache/ccache_3.6.bb b/meta/recipes-devtools/ccache/ccache_3.6.bb
deleted file mode 100644
index 60807be0ae..0000000000
--- a/meta/recipes-devtools/ccache/ccache_3.6.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require ccache.inc
2
3LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=70762511f9c509cc2a4e4ba2ef687ae3"
5
6SRC_URI[md5sum] = "bd6fd69db28426baf22ec0acdd5c4b2a"
7SRC_URI[sha256sum] = "a3f2b91a2353b65a863c5901251efe48060ecdebec46b5eaec8ea8e092b9e871"
8
9SRC_URI += " \
10 file://0002-dev.mk.in-fix-file-name-too-long.patch \
11 file://0003-Fix-Segmentation-fault-error-when-gcc-o-dev-null.patch \
12"
diff --git a/meta/recipes-devtools/ccache/ccache_3.7.1.bb b/meta/recipes-devtools/ccache/ccache_3.7.1.bb
new file mode 100644
index 0000000000..1db7094b73
--- /dev/null
+++ b/meta/recipes-devtools/ccache/ccache_3.7.1.bb
@@ -0,0 +1,7 @@
1require ccache.inc
2
3LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=0094c59039cec66b8a4c905204333514"
5
6SRC_URI[md5sum] = "74339465ab87e0b406985ed69515f19b"
7SRC_URI[sha256sum] = "e562fcdbe766406b6fe4bf97ce5c001d2be8a17465f33bcddefc9499bbb057d8"
diff --git a/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch b/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
deleted file mode 100644
index 16a6e9d80f..0000000000
--- a/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 7dab2995ed8eeccd7b0acd79668bc28f3a2427d5 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Wed, 16 Sep 2015 19:45:40 -0700
4Subject: [PATCH] dev.mk.in: fix file name too long error
5
6The all_cppflags changes path to filename which causes file name too long
7error when the path is longer than NAME_MAX (usually 255). Strip srcdir
8to fix the problem.
9
10Upstream-Status: Backport [https://github.com/ccache/ccache/commit/4d86e884d07ba1853a0c70507cc4d04107f57c29]
11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13
14---
15 dev.mk.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/dev.mk.in b/dev.mk.in
19index 91b0a57..583ade0 100644
20--- a/dev.mk.in
21+++ b/dev.mk.in
22@@ -1,7 +1,7 @@
23 # GNU make syntax reigns in this file.
24
25 all_cflags += -Werror @more_warnings@
26-all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$<)).d
27+all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$(subst $(srcdir)/,,$<))).d
28
29 A2X = a2x
30 ASCIIDOC = asciidoc
diff --git a/meta/recipes-devtools/ccache/files/0003-Fix-Segmentation-fault-error-when-gcc-o-dev-null.patch b/meta/recipes-devtools/ccache/files/0003-Fix-Segmentation-fault-error-when-gcc-o-dev-null.patch
deleted file mode 100644
index b3012b7e89..0000000000
--- a/meta/recipes-devtools/ccache/files/0003-Fix-Segmentation-fault-error-when-gcc-o-dev-null.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1From c51b63758e95247e3c1e2f06e5f5bfb49849e66d Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 22 Jan 2019 16:30:52 +0800
4Subject: [PATCH] Fix Segmentation fault error when gcc -o /dev/null
5
6Fixed:
7$ export CCACHE_DEBUG=1
8$ ccache gcc -c hello.c -o /dev/null
9
10Segmentation fault (core dumped)
11
12This is because failed to open /dev/null.foo (Permission denied), check file
13stream before write to it can fix the problem.
14
15Upstream-Status: Backport [https://github.com/ccache/ccache/commit/4d86e884d07ba1853a0c70507cc4d04107f57c29]
16
17Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
18---
19 src/ccache.c | 15 ++++++++++++---
20 src/util.c | 8 ++++++--
21 2 files changed, 18 insertions(+), 5 deletions(-)
22
23diff --git a/src/ccache.c b/src/ccache.c
24index b4cdb86..8c227df 100644
25--- a/src/ccache.c
26+++ b/src/ccache.c
27@@ -521,9 +521,13 @@ init_hash_debug(struct hash *hash, const char *obj_path, char type,
28
29 char *path = format("%s.ccache-input-%c", obj_path, type);
30 FILE *debug_binary_file = fopen(path, "wb");
31- hash_enable_debug(hash, section_name, debug_binary_file, debug_text_file);
32+ if (debug_binary_file) {
33+ hash_enable_debug(hash, section_name, debug_binary_file, debug_text_file);
34+ exitfn_add(fclose_exitfn, debug_binary_file);
35+ } else {
36+ cc_log("Failed to open %s: %s", path, strerror(errno));
37+ }
38 free(path);
39- exitfn_add(fclose_exitfn, debug_binary_file);
40 }
41
42 static enum guessed_compiler
43@@ -3670,8 +3674,13 @@ ccache(int argc, char *argv[])
44 if (conf->debug) {
45 char *path = format("%s.ccache-input-text", output_obj);
46 debug_text_file = fopen(path, "w");
47+ if (debug_text_file) {
48+ exitfn_add(fclose_exitfn, debug_text_file);
49+ }
50+ else {
51+ cc_log("Failed to open %s: %s", path, strerror(errno));
52+ }
53 free(path);
54- exitfn_add(fclose_exitfn, debug_text_file);
55 }
56
57 struct hash *common_hash = hash_init();
58diff --git a/src/util.c b/src/util.c
59index e442cc4..a49fb4c 100644
60--- a/src/util.c
61+++ b/src/util.c
62@@ -219,8 +219,12 @@ void
63 cc_dump_log_buffer(const char *path)
64 {
65 FILE *file = fopen(path, "w");
66- (void) fwrite(logbuffer, 1, logsize, file);
67- fclose(file);
68+ if (file) {
69+ (void) fwrite(logbuffer, 1, logsize, file);
70+ fclose(file);
71+ } else {
72+ cc_log("Failed to open %s: %s", path, strerror(errno));
73+ }
74 }
75
76 // Something went badly wrong!
77--
782.7.4
79