Skip to contentSkip to conversation

ccache: upgrade 3.6 -> 3.7.1

PATCH New Adrian Bunk 1 participant 1 message May 9, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 ccache: upgrade 3.6 -> 3.7.1

Remove backported patches.
Switch to new download location.

---
 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
meta/recipes-devtools/ccache/ccache.inc +1 -1
index 7f800659a3..a31acada57 100644
@@ -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
 
meta/recipes-devtools/ccache/ccache_3.6.bb deleted +0 -12
deleted file mode 100644
index 60807be0ae..0000000000
@@ -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 \
-"
meta/recipes-devtools/ccache/ccache_3.7.1.bb new file +7 -0
new file mode 100644
index 0000000000..1db7094b73
@@ -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"
meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch deleted +0 -30
deleted file mode 100644
index 16a6e9d80f..0000000000
@@ -1,30 +0,0 @@
-From 7dab2995ed8eeccd7b0acd79668bc28f3a2427d5 Mon Sep 17 00:00:00 2001
-From: Robert Yang <[email protected]>
-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 <[email protected]>
-
----
- 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
meta/recipes-devtools/ccache/files/0003-Fix-Segmentation-fault-error-when-gcc-o-dev-null.patch deleted +0 -79

79 lines not on this page · raw message

Signature · 1 line
2.17.1