Re: [OE-core] [PATCH] ccache: upgrade 3.6 -> 3.7.1

2019-05-09 Thread Adrian Bunk
On Wed, May 08, 2019 at 10:47:38PM +0100, Richard Purdie wrote:
> On Tue, 2019-05-07 at 16:11 +0300, Adrian Bunk wrote:
> > Remove backported patches.
> > Switch to new download location.
> > 
> > Signed-off-by: Adrian Bunk 
> 
> This patch caused an unintended side effect which you can reproduce
> with:
> 
> oe-selftest -r buildoptions.ImageOptionsTests.test_ccache_tool
> 
> Its the change from .gz to .xz which introduces circular dependencies
> for ccache-native.
>...

OK, I'm sending v3 using .gz.

> Cheers,
> 
> Richard

cu
Adrian

-- 

   "Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
   "Only a promise," Lao Er said.
   Pearl S. Buck - Dragon Seed

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH] ccache: upgrade 3.6 -> 3.7.1

2019-05-08 Thread Richard Purdie
On Tue, 2019-05-07 at 16:11 +0300, Adrian Bunk wrote:
> Remove backported patches.
> Switch to new download location.
> 
> Signed-off-by: Adrian Bunk 

This patch caused an unintended side effect which you can reproduce
with:

oe-selftest -r buildoptions.ImageOptionsTests.test_ccache_tool

Its the change from .gz to .xz which introduces circular dependencies
for ccache-native.

(one of the issues in 
https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/456)

Cheers,

Richard

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] ccache: upgrade 3.6 -> 3.7.1

2019-05-07 Thread Adrian Bunk
Remove backported patches.
Switch to new download location.

Signed-off-by: Adrian Bunk 
---
 meta/recipes-devtools/ccache/ccache.inc   |  2 +-
 meta/recipes-devtools/ccache/ccache_3.6.bb| 12 ---
 meta/recipes-devtools/ccache/ccache_3.7.1.bb  |  7 ++
 ...002-dev.mk.in-fix-file-name-too-long.patch | 30 ---
 ...tion-fault-error-when-gcc-o-dev-null.patch | 79 ---
 5 files changed, 8 insertions(+), 122 deletions(-)
 delete mode 100644 meta/recipes-devtools/ccache/ccache_3.6.bb
 create mode 100644 meta/recipes-devtools/ccache/ccache_3.7.1.bb
 delete mode 100644 
meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
 delete mode 100644 
meta/recipes-devtools/ccache/files/0003-Fix-Segmentation-fault-error-when-gcc-o-dev-null.patch

diff --git a/meta/recipes-devtools/ccache/ccache.inc 
b/meta/recipes-devtools/ccache/ccache.inc
index 7f800659a3..e8676437fb 100644
--- a/meta/recipes-devtools/ccache/ccache.inc
+++ b/meta/recipes-devtools/ccache/ccache.inc
@@ -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.xz;
 
 inherit autotools
 
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..00
--- a/meta/recipes-devtools/ccache/ccache_3.6.bb
+++ /dev/null
@@ -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 
\
-"
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 00..d2bd7ac903
--- /dev/null
+++ b/meta/recipes-devtools/ccache/ccache_3.7.1.bb
@@ -0,0 +1,7 @@
+require ccache.inc
+
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=0094c59039cec66b8a4c905204333514"
+
+SRC_URI[md5sum] = "30f5f6fa06a95bba94695e8fa6a05899"
+SRC_URI[sha256sum] = 
"66fc121a2a33968f9ec428e02f48ff4b8896fbabb759e9c09352267014dcbe65"
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..00
--- 
a/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7dab2995ed8eeccd7b0acd79668bc28f3a2427d5 Mon Sep 17 00:00:00 2001
-From: Robert Yang 
-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 
-

- 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
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..00
--- 
a/meta/recipes-devtools/ccache/files/0003-Fix-Segmentation-fault-error-when-gcc-o-dev-null.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From c51b63758e95247e3c1e2f06e5f5bfb49849e66d Mon Sep 17 00:00:00 2001
-From: Robert Yang 
-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 

- 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 @@