summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-07-25 01:16:31 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-26 08:56:26 +0100
commitc406e9acd7af04b7f55478b62be649660fcd19e1 (patch)
treee5e66b124254061f24f654a5ffdbc202f2648edb /meta
parent36f6219c4913980d62e89bb867a476c289d1c4a3 (diff)
downloadpoky-c406e9acd7af04b7f55478b62be649660fcd19e1.tar.gz
ccache: 3.2.4 -> 3.2.5
Add Revert-Create-man-page-in-the-make-install-from-git-.patch to disable asciidoc since we don't have it. (From OE-Core rev: 40627f5c334544178b056078da5e1d645ebd2a38) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/ccache/ccache_3.2.4.bb10
-rw-r--r--meta/recipes-devtools/ccache/ccache_3.2.5.bb11
-rw-r--r--meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch33
3 files changed, 44 insertions, 10 deletions
diff --git a/meta/recipes-devtools/ccache/ccache_3.2.4.bb b/meta/recipes-devtools/ccache/ccache_3.2.4.bb
deleted file mode 100644
index fd45e4160e..0000000000
--- a/meta/recipes-devtools/ccache/ccache_3.2.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require ccache.inc
2
3LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b3c337e7664559a789d9f7a93e5283c1"
5
6SRCREV = "2254797f1c5cfb83c4272da7b138f7f47218eb7d"
7
8SRC_URI += " \
9 file://0002-dev.mk.in-fix-file-name-too-long.patch \
10"
diff --git a/meta/recipes-devtools/ccache/ccache_3.2.5.bb b/meta/recipes-devtools/ccache/ccache_3.2.5.bb
new file mode 100644
index 0000000000..afd1b0ea12
--- /dev/null
+++ b/meta/recipes-devtools/ccache/ccache_3.2.5.bb
@@ -0,0 +1,11 @@
1require ccache.inc
2
3LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b8a4fa173ed91c1a5204ea4f9c9eadc3"
5
6SRCREV = "424d3ae1fb73444c6c38bf189f8fc048f66d6499"
7
8SRC_URI += " \
9 file://0002-dev.mk.in-fix-file-name-too-long.patch \
10 file://Revert-Create-man-page-in-the-make-install-from-git-.patch \
11"
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
new file mode 100644
index 0000000000..f0208b9dc2
--- /dev/null
+++ b/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch
@@ -0,0 +1,33 @@
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