diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2018-07-03 12:11:57 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-04 12:27:27 +0100 |
| commit | b137af6c2dc3d6c21808ecc872fbebbac5f96295 (patch) | |
| tree | 2fdac6dce58b8d8d27b798a6d93a0f36b3cdc4c6 /meta/recipes-devtools/ccache | |
| parent | 2577fbed729ddc8deb7a657dbaa695d5bd7ef20d (diff) | |
| download | openembedded-core-contrib-b137af6c2dc3d6c21808ecc872fbebbac5f96295.tar.gz | |
ccache: 3.3.5 -> 3.4.2
* The license file is changed to LICENSE.adoc, it is still GPLv3+.
* Removed Revert-Create-man-page-in-the-make-install-from-git-.patch, it was
used for fixing a build failure of no asciidoc, but now there is no such a
failure, so remove it.
* Refreshed 0002-dev.mk.in-fix-file-name-too-long.patch
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/ccache')
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 929f0f12767..00000000000 --- a/meta/recipes-devtools/ccache/ccache_3.3.5.bb +++ /dev/null @@ -1,12 +0,0 @@ -require ccache.inc - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=dae379a85bb6e9d594773e0aa64876f6" - -SRC_URI[md5sum] = "eee58db7cce892febddb989308dc568f" -SRC_URI[sha256sum] = "190576a6e938760ec8113523e6fd380141117303e90766cc4802e770422b30c6" - -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 \ -" 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 00000000000..72309348b2e --- /dev/null +++ b/meta/recipes-devtools/ccache/ccache_3.4.2.bb @@ -0,0 +1,11 @@ +require ccache.inc + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=2722abeaf1750dbf175b9491112374e1" + +SRC_URI[md5sum] = "9e048f88f3897125864f9a5e1abfb72d" +SRC_URI[sha256sum] = "18a8b14367d63d3d37fb6c33cba60e1b7fcd7a63d608df97c9771ae0d234fee2" + +SRC_URI += " \ + file://0002-dev.mk.in-fix-file-name-too-long.patch \ +" 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 3f01c69b2a8..68c2371fb31 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 @@ -From 71bd0082c6edcf73f054a8a4fa34bd8dd4de7cd7 Mon Sep 17 00:00:00 2001 +From 7dab2995ed8eeccd7b0acd79668bc28f3a2427d5 Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.yang@windriver.com> Date: Wed, 16 Sep 2015 19:45:40 -0700 Subject: [PATCH] dev.mk.in: fix file name too long @@ -10,14 +10,15 @@ to fix the problem. Upstream-Status: Pending Signed-off-by: Robert Yang <liezhi.yang@windriver.com> + --- - dev.mk.in | 2 +- + dev.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: ccache-3.3.4/dev.mk.in -=================================================================== ---- ccache-3.3.4.orig/dev.mk.in -+++ ccache-3.3.4/dev.mk.in +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. @@ -25,5 +26,5 @@ Index: ccache-3.3.4/dev.mk.in -all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$<)).d +all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$(subst $(srcdir)/,,$<))).d + A2X = a2x ASCIIDOC = asciidoc - 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 f0208b9dc23..00000000000 --- a/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 - |