summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/ccache/ccache_3.3.5.bb12
-rw-r--r--meta/recipes-devtools/ccache/ccache_3.4.2.bb11
-rw-r--r--meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch15
-rw-r--r--meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch33
4 files changed, 19 insertions, 52 deletions
diff --git a/meta/recipes-devtools/ccache/ccache_3.3.5.bb b/meta/recipes-devtools/ccache/ccache_3.3.5.bb
deleted file mode 100644
index 929f0f1276..0000000000
--- a/meta/recipes-devtools/ccache/ccache_3.3.5.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require ccache.inc
2
3LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=dae379a85bb6e9d594773e0aa64876f6"
5
6SRC_URI[md5sum] = "eee58db7cce892febddb989308dc568f"
7SRC_URI[sha256sum] = "190576a6e938760ec8113523e6fd380141117303e90766cc4802e770422b30c6"
8
9SRC_URI += " \
10 file://0002-dev.mk.in-fix-file-name-too-long.patch \
11 file://Revert-Create-man-page-in-the-make-install-from-git-.patch \
12"
diff --git a/meta/recipes-devtools/ccache/ccache_3.4.2.bb b/meta/recipes-devtools/ccache/ccache_3.4.2.bb
new file mode 100644
index 0000000000..72309348b2
--- /dev/null
+++ b/meta/recipes-devtools/ccache/ccache_3.4.2.bb
@@ -0,0 +1,11 @@
1require ccache.inc
2
3LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=2722abeaf1750dbf175b9491112374e1"
5
6SRC_URI[md5sum] = "9e048f88f3897125864f9a5e1abfb72d"
7SRC_URI[sha256sum] = "18a8b14367d63d3d37fb6c33cba60e1b7fcd7a63d608df97c9771ae0d234fee2"
8
9SRC_URI += " \
10 file://0002-dev.mk.in-fix-file-name-too-long.patch \
11"
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
index 3f01c69b2a..68c2371fb3 100644
--- 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
@@ -1,4 +1,4 @@
1From 71bd0082c6edcf73f054a8a4fa34bd8dd4de7cd7 Mon Sep 17 00:00:00 2001 1From 7dab2995ed8eeccd7b0acd79668bc28f3a2427d5 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Wed, 16 Sep 2015 19:45:40 -0700 3Date: Wed, 16 Sep 2015 19:45:40 -0700
4Subject: [PATCH] dev.mk.in: fix file name too long 4Subject: [PATCH] dev.mk.in: fix file name too long
@@ -10,14 +10,15 @@ to fix the problem.
10Upstream-Status: Pending 10Upstream-Status: Pending
11 11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13
13--- 14---
14 dev.mk.in | 2 +- 15 dev.mk.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
16 17
17Index: ccache-3.3.4/dev.mk.in 18diff --git a/dev.mk.in b/dev.mk.in
18=================================================================== 19index 91b0a57..583ade0 100644
19--- ccache-3.3.4.orig/dev.mk.in 20--- a/dev.mk.in
20+++ ccache-3.3.4/dev.mk.in 21+++ b/dev.mk.in
21@@ -1,7 +1,7 @@ 22@@ -1,7 +1,7 @@
22 # GNU make syntax reigns in this file. 23 # GNU make syntax reigns in this file.
23 24
@@ -25,5 +26,5 @@ Index: ccache-3.3.4/dev.mk.in
25-all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$<)).d 26-all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$<)).d
26+all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$(subst $(srcdir)/,,$<))).d 27+all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$(subst $(srcdir)/,,$<))).d
27 28
29 A2X = a2x
28 ASCIIDOC = asciidoc 30 ASCIIDOC = asciidoc
29 CPPCHECK = cppcheck
diff --git a/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch b/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch
deleted file mode 100644
index f0208b9dc2..0000000000
--- a/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 94fabcdda5c7e54ccdbc1f0aeccb26ce30e61226 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 18 Jul 2016 19:53:00 -0700
4Subject: [PATCH] Revert "Create man page in the make-install-from-git-repo
5 case"
6
7This reverts commit b86784902d28defd5e475c8922de594787df4541.
8
9We dont' have asciidoc, so revert it.
10
11Upstream-Status: Inappropriate [OE-Core specific]
12
13Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14---
15 Makefile.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/Makefile.in b/Makefile.in
19index d474f2a..c6cdc04 100644
20--- a/Makefile.in
21+++ b/Makefile.in
22@@ -76,7 +76,7 @@ ccache$(EXEEXT): $(ccache_objs) $(extra_libs)
23 $(CC) $(all_cflags) -o $@ $(ccache_objs) $(LDFLAGS) $(extra_libs) $(LIBS)
24
25 .PHONY: install
26-install: all $(srcdir)/ccache.1
27+install: all
28 $(installcmd) -d $(DESTDIR)$(bindir)
29 $(installcmd) -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
30 $(installcmd) -d $(DESTDIR)$(mandir)/man1
31--
322.9.0
33