From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- poky/meta/recipes-devtools/ccache/ccache.inc | 16 +++++++++++ poky/meta/recipes-devtools/ccache/ccache_3.3.5.bb | 12 ++++++++ .../0002-dev.mk.in-fix-file-name-too-long.patch | 29 +++++++++++++++++++ ...te-man-page-in-the-make-install-from-git-.patch | 33 ++++++++++++++++++++++ 4 files changed, 90 insertions(+) create mode 100644 poky/meta/recipes-devtools/ccache/ccache.inc create mode 100644 poky/meta/recipes-devtools/ccache/ccache_3.3.5.bb create mode 100644 poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch create mode 100644 poky/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch (limited to 'poky/meta/recipes-devtools/ccache') diff --git a/poky/meta/recipes-devtools/ccache/ccache.inc b/poky/meta/recipes-devtools/ccache/ccache.inc new file mode 100644 index 000000000..656632893 --- /dev/null +++ b/poky/meta/recipes-devtools/ccache/ccache.inc @@ -0,0 +1,16 @@ +SUMMARY = "a fast C/C++ compiler cache" +DESCRIPTION = "ccache is a compiler cache. It speeds up recompilation \ +by caching the result of previous compilations and detecting when the \ +same compilation is being done again. Supported languages are C, C\+\+, \ +Objective-C and Objective-C++." +HOMEPAGE = "http://ccache.samba.org" +SECTION = "devel" +LICENSE = "GPLv3+" + +DEPENDS = "zlib" + +SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.xz" + +inherit autotools + +BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-devtools/ccache/ccache_3.3.5.bb b/poky/meta/recipes-devtools/ccache/ccache_3.3.5.bb new file mode 100644 index 000000000..929f0f127 --- /dev/null +++ b/poky/meta/recipes-devtools/ccache/ccache_3.3.5.bb @@ -0,0 +1,12 @@ +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/poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch b/poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch new file mode 100644 index 000000000..3f01c69b2 --- /dev/null +++ b/poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch @@ -0,0 +1,29 @@ +From 71bd0082c6edcf73f054a8a4fa34bd8dd4de7cd7 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Wed, 16 Sep 2015 19:45:40 -0700 +Subject: [PATCH] dev.mk.in: fix file name too long + +The all_cppflags change paths to filename which cause file name too long +error when the path is longer than NAME_MAX (usually 255). Strip srcdir +to fix the problem. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang +--- + 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 +@@ -1,7 +1,7 @@ + # GNU make syntax reigns in this file. + + all_cflags += -Werror +-all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$<)).d ++all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$(subst $(srcdir)/,,$<))).d + + ASCIIDOC = asciidoc + CPPCHECK = cppcheck diff --git a/poky/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch b/poky/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch new file mode 100644 index 000000000..f0208b9dc --- /dev/null +++ b/poky/meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch @@ -0,0 +1,33 @@ +From 94fabcdda5c7e54ccdbc1f0aeccb26ce30e61226 Mon Sep 17 00:00:00 2001 +From: Robert Yang +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 +--- + 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 + -- cgit v1.2.3