mirror of
https://git.yoctoproject.org/poky
synced 2026-04-02 17:02:21 +02:00
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>
This commit is contained in:
Adrian Bunk
committed by
Richard Purdie
Richard Purdie
parent
837c786d60
commit
33ed48fb26
@@ -9,7 +9,7 @@ LICENSE = "GPLv3+"
|
||||
|
||||
DEPENDS = "zlib"
|
||||
|
||||
SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz"
|
||||
SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz"
|
||||
|
||||
inherit autotools
|
||||
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
require ccache.inc
|
||||
|
||||
LICENSE = "GPLv3+"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=70762511f9c509cc2a4e4ba2ef687ae3"
|
||||
|
||||
SRC_URI[md5sum] = "bd6fd69db28426baf22ec0acdd5c4b2a"
|
||||
SRC_URI[sha256sum] = "a3f2b91a2353b65a863c5901251efe48060ecdebec46b5eaec8ea8e092b9e871"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0002-dev.mk.in-fix-file-name-too-long.patch \
|
||||
file://0003-Fix-Segmentation-fault-error-when-gcc-o-dev-null.patch \
|
||||
"
|
||||
7
meta/recipes-devtools/ccache/ccache_3.7.1.bb
Normal file
7
meta/recipes-devtools/ccache/ccache_3.7.1.bb
Normal file
@@ -0,0 +1,7 @@
|
||||
require ccache.inc
|
||||
|
||||
LICENSE = "GPLv3+"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=0094c59039cec66b8a4c905204333514"
|
||||
|
||||
SRC_URI[md5sum] = "74339465ab87e0b406985ed69515f19b"
|
||||
SRC_URI[sha256sum] = "e562fcdbe766406b6fe4bf97ce5c001d2be8a17465f33bcddefc9499bbb057d8"
|
||||
@@ -1,30 +0,0 @@
|
||||
From 7dab2995ed8eeccd7b0acd79668bc28f3a2427d5 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Wed, 16 Sep 2015 19:45:40 -0700
|
||||
Subject: [PATCH] dev.mk.in: fix file name too long error
|
||||
|
||||
The all_cppflags changes path to filename which causes file name too long
|
||||
error when the path is longer than NAME_MAX (usually 255). Strip srcdir
|
||||
to fix the problem.
|
||||
|
||||
Upstream-Status: Backport [https://github.com/ccache/ccache/commit/4d86e884d07ba1853a0c70507cc4d04107f57c29]
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
|
||||
---
|
||||
dev.mk.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dev.mk.in b/dev.mk.in
|
||||
index 91b0a57..583ade0 100644
|
||||
--- a/dev.mk.in
|
||||
+++ b/dev.mk.in
|
||||
@@ -1,7 +1,7 @@
|
||||
# GNU make syntax reigns in this file.
|
||||
|
||||
all_cflags += -Werror @more_warnings@
|
||||
-all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$<)).d
|
||||
+all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$(subst $(srcdir)/,,$<))).d
|
||||
|
||||
A2X = a2x
|
||||
ASCIIDOC = asciidoc
|
||||
@@ -1,79 +0,0 @@
|
||||
From c51b63758e95247e3c1e2f06e5f5bfb49849e66d Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Tue, 22 Jan 2019 16:30:52 +0800
|
||||
Subject: [PATCH] Fix Segmentation fault error when gcc -o /dev/null
|
||||
|
||||
Fixed:
|
||||
$ export CCACHE_DEBUG=1
|
||||
$ ccache gcc -c hello.c -o /dev/null
|
||||
|
||||
Segmentation fault (core dumped)
|
||||
|
||||
This is because failed to open /dev/null.foo (Permission denied), check file
|
||||
stream before write to it can fix the problem.
|
||||
|
||||
Upstream-Status: Backport [https://github.com/ccache/ccache/commit/4d86e884d07ba1853a0c70507cc4d04107f57c29]
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
---
|
||||
src/ccache.c | 15 ++++++++++++---
|
||||
src/util.c | 8 ++++++--
|
||||
2 files changed, 18 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/ccache.c b/src/ccache.c
|
||||
index b4cdb86..8c227df 100644
|
||||
--- a/src/ccache.c
|
||||
+++ b/src/ccache.c
|
||||
@@ -521,9 +521,13 @@ init_hash_debug(struct hash *hash, const char *obj_path, char type,
|
||||
|
||||
char *path = format("%s.ccache-input-%c", obj_path, type);
|
||||
FILE *debug_binary_file = fopen(path, "wb");
|
||||
- hash_enable_debug(hash, section_name, debug_binary_file, debug_text_file);
|
||||
+ if (debug_binary_file) {
|
||||
+ hash_enable_debug(hash, section_name, debug_binary_file, debug_text_file);
|
||||
+ exitfn_add(fclose_exitfn, debug_binary_file);
|
||||
+ } else {
|
||||
+ cc_log("Failed to open %s: %s", path, strerror(errno));
|
||||
+ }
|
||||
free(path);
|
||||
- exitfn_add(fclose_exitfn, debug_binary_file);
|
||||
}
|
||||
|
||||
static enum guessed_compiler
|
||||
@@ -3670,8 +3674,13 @@ ccache(int argc, char *argv[])
|
||||
if (conf->debug) {
|
||||
char *path = format("%s.ccache-input-text", output_obj);
|
||||
debug_text_file = fopen(path, "w");
|
||||
+ if (debug_text_file) {
|
||||
+ exitfn_add(fclose_exitfn, debug_text_file);
|
||||
+ }
|
||||
+ else {
|
||||
+ cc_log("Failed to open %s: %s", path, strerror(errno));
|
||||
+ }
|
||||
free(path);
|
||||
- exitfn_add(fclose_exitfn, debug_text_file);
|
||||
}
|
||||
|
||||
struct hash *common_hash = hash_init();
|
||||
diff --git a/src/util.c b/src/util.c
|
||||
index e442cc4..a49fb4c 100644
|
||||
--- a/src/util.c
|
||||
+++ b/src/util.c
|
||||
@@ -219,8 +219,12 @@ void
|
||||
cc_dump_log_buffer(const char *path)
|
||||
{
|
||||
FILE *file = fopen(path, "w");
|
||||
- (void) fwrite(logbuffer, 1, logsize, file);
|
||||
- fclose(file);
|
||||
+ if (file) {
|
||||
+ (void) fwrite(logbuffer, 1, logsize, file);
|
||||
+ fclose(file);
|
||||
+ } else {
|
||||
+ cc_log("Failed to open %s: %s", path, strerror(errno));
|
||||
+ }
|
||||
}
|
||||
|
||||
// Something went badly wrong!
|
||||
--
|
||||
2.7.4
|
||||
|
||||
Reference in New Issue
Block a user