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>
This commit is contained in:
Robert Yang 2016-07-25 01:16:31 -07:00 committed by Richard Purdie
parent 36f6219c49
commit c406e9acd7
3 changed files with 44 additions and 10 deletions

View File

@ -1,10 +0,0 @@
require ccache.inc
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b3c337e7664559a789d9f7a93e5283c1"
SRCREV = "2254797f1c5cfb83c4272da7b138f7f47218eb7d"
SRC_URI += " \
file://0002-dev.mk.in-fix-file-name-too-long.patch \
"

View File

@ -0,0 +1,11 @@
require ccache.inc
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b8a4fa173ed91c1a5204ea4f9c9eadc3"
SRCREV = "424d3ae1fb73444c6c38bf189f8fc048f66d6499"
SRC_URI += " \
file://0002-dev.mk.in-fix-file-name-too-long.patch \
file://Revert-Create-man-page-in-the-make-install-from-git-.patch \
"

View File

@ -0,0 +1,33 @@
From 94fabcdda5c7e54ccdbc1f0aeccb26ce30e61226 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Mon, 18 Jul 2016 19:53:00 -0700
Subject: [PATCH] Revert "Create man page in the make-install-from-git-repo
case"
This reverts commit b86784902d28defd5e475c8922de594787df4541.
We dont' have asciidoc, so revert it.
Upstream-Status: Inappropriate [OE-Core specific]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index d474f2a..c6cdc04 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,7 +76,7 @@ ccache$(EXEEXT): $(ccache_objs) $(extra_libs)
$(CC) $(all_cflags) -o $@ $(ccache_objs) $(LDFLAGS) $(extra_libs) $(LIBS)
.PHONY: install
-install: all $(srcdir)/ccache.1
+install: all
$(installcmd) -d $(DESTDIR)$(bindir)
$(installcmd) -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
$(installcmd) -d $(DESTDIR)$(mandir)/man1
--
2.9.0