diff options
Diffstat (limited to 'meta/recipes-devtools/ccache')
5 files changed, 26 insertions, 133 deletions
diff --git a/meta/recipes-devtools/ccache/ccache.inc b/meta/recipes-devtools/ccache/ccache.inc deleted file mode 100644 index 69aa64e5e6..0000000000 --- a/meta/recipes-devtools/ccache/ccache.inc +++ /dev/null @@ -1,18 +0,0 @@ -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 = "git://git.samba.org/ccache.git" - -S = "${WORKDIR}/git" - -inherit autotools - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/ccache/ccache_3.2.3.bb b/meta/recipes-devtools/ccache/ccache_3.2.3.bb deleted file mode 100644 index 97f557a9b6..0000000000 --- a/meta/recipes-devtools/ccache/ccache_3.2.3.bb +++ /dev/null @@ -1,10 +0,0 @@ -require ccache.inc - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b3c337e7664559a789d9f7a93e5283c1" - -SRCREV = "4cad46e8ee0053144bb00919f0dadd20c1f87013" - -SRC_URI += "file://0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch \ - file://0002-dev.mk.in-fix-file-name-too-long.patch \ -" diff --git a/meta/recipes-devtools/ccache/ccache_4.5.1.bb b/meta/recipes-devtools/ccache/ccache_4.5.1.bb new file mode 100644 index 0000000000..11d939c7aa --- /dev/null +++ b/meta/recipes-devtools/ccache/ccache_4.5.1.bb @@ -0,0 +1,26 @@ +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 = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=8fe0fdfdc7a892516526b86c28d06a16" + +DEPENDS = "zstd" + +SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI[sha256sum] = "f0d3cff5d555d6868f14a7d05696f0370074e475304fd5aa152b98f892364981" + +UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/" + +inherit cmake + +PATCHTOOL = "patch" + +BBCLASSEXTEND = "native nativesdk" + +PACKAGECONFIG[docs] = "-DENABLE_DOCUMENTATION=ON,-DENABLE_DOCUMENTATION=OFF,asciidoc" +PACKAGECONFIG[redis] = "-DREDIS_STORAGE_BACKEND=ON,-DREDIS_STORAGE_BACKEND=OFF,hiredis" diff --git a/meta/recipes-devtools/ccache/files/0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch b/meta/recipes-devtools/ccache/files/0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch deleted file mode 100644 index f5bd9aaec7..0000000000 --- a/meta/recipes-devtools/ccache/files/0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch +++ /dev/null @@ -1,73 +0,0 @@ -From f74c76107933046309861680b741adc67ac2a34e Mon Sep 17 00:00:00 2001 -From: Joel Rosdahl <joel@rosdahl.net> -Date: Mon, 17 Aug 2015 19:05:14 +0200 -Subject: [PATCH] Fix regression in recent change related to zlib in - nonstandard location - -To allow for specifying a -L flag in LDFLAGS and have it take effect for --lz, 0220de9c8ebfb18caae2ac1aa163d060e98ceade put -lz in extra_libs -instead of extra_ldflags. However, extra_libs is supposed to contain -paths to libraries which are prerequisites of the ccache link rule, and -some older versions of make got confused by seeing -lz as a -prerequisite. - -This fix is to revert 0220de9c8ebfb18caae2ac1aa163d060e98ceade and -instead make sure that LDFLAGS comes before extra_ldflags. - -Upstream-Status: Backport ---- - Makefile.in | 2 +- - NEWS.txt | 10 ++++++++++ - configure.ac | 2 +- - 3 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index e7515b1..d3621cd 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -20,7 +20,7 @@ RANLIB = @RANLIB@ - - all_cflags = $(CFLAGS) - all_cppflags = @DEFS@ @extra_cppflags@ -DSYSCONFDIR=$(sysconfdir) -I. -I$(srcdir) $(CPPFLAGS) --all_ldflags = @extra_ldflags@ $(LDFLAGS) -+all_ldflags = $(LDFLAGS) @extra_ldflags@ - extra_libs = @extra_libs@ - - base_sources = \ -diff --git a/NEWS.txt b/NEWS.txt -index f13feeb..eaeadf6 100644 ---- a/NEWS.txt -+++ b/NEWS.txt -@@ -2,6 +2,16 @@ ccache news - =========== - - -+Unreleased 3.2.4 -+---------------- -+ -+Bug fixes -+~~~~~~~~~ -+ -+- Fixed build error related to zlib on systems with older make versions -+ (regression in ccache 3.2.3). -+ -+ - ccache 3.2.3 - ------------ - Release date: 2015-08-16 -diff --git a/configure.ac b/configure.ac -index 8d8ce92..9e65588 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -120,7 +120,7 @@ if test x${use_bundled_zlib} = xyes; then - extra_libs="zlib/libz.a" - mkdir -p zlib - else -- extra_libs="-lz" -+ extra_ldflags="-lz" - fi - - dnl Linking on Windows needs ws2_32 --- -2.1.4 - 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 deleted file mode 100644 index 837cfadf6a..0000000000 --- a/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 71bd0082c6edcf73f054a8a4fa34bd8dd4de7cd7 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 - -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 <liezhi.yang@windriver.com> ---- - dev.mk.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dev.mk.in b/dev.mk.in -index 1261ad3..ec55ac4 100644 ---- a/dev.mk.in -+++ b/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 - GPERF = gperf --- -1.7.9.5 - |