summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-09-03 18:34:10 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-04 16:23:52 +0100
commitd025e78cc176ff22834352dde783021cbb84cb8b (patch)
treee010808c81847eb2f63157c9cb60c4e7690c22d5
parentfac0d67ec25f357684bcd0c80be282e1bca3adef (diff)
downloadpoky-d025e78cc176ff22834352dde783021cbb84cb8b.tar.gz
ccache: update to 3.2.3
The LICENSE checksum has changed because of updated copyright years. SRC_URI has been changed to git, because upstream tarball is broken (includes configure.ac but not .m4 files it depends on). Add a backported patch that fixes builds with older versions of make and external zlib. (From OE-Core rev: 1a78720cba38b47d89c0460db7846d0984916273) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/ccache/ccache.inc4
-rw-r--r--meta/recipes-devtools/ccache/ccache_3.1.11.bb7
-rw-r--r--meta/recipes-devtools/ccache/ccache_3.2.3.bb8
-rw-r--r--meta/recipes-devtools/ccache/files/0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch73
4 files changed, 84 insertions, 8 deletions
diff --git a/meta/recipes-devtools/ccache/ccache.inc b/meta/recipes-devtools/ccache/ccache.inc
index 087cb7db81..4790021b5f 100644
--- a/meta/recipes-devtools/ccache/ccache.inc
+++ b/meta/recipes-devtools/ccache/ccache.inc
@@ -9,7 +9,9 @@ LICENSE = "GPLv3+"
9 9
10DEPENDS = "zlib" 10DEPENDS = "zlib"
11 11
12SRC_URI = "http://samba.org/ftp/ccache/ccache-${PV}.tar.xz" 12SRC_URI = "git://git.samba.org/ccache.git"
13
14S = "${WORKDIR}/git"
13 15
14inherit autotools 16inherit autotools
15 17
diff --git a/meta/recipes-devtools/ccache/ccache_3.1.11.bb b/meta/recipes-devtools/ccache/ccache_3.1.11.bb
deleted file mode 100644
index 76960031e0..0000000000
--- a/meta/recipes-devtools/ccache/ccache_3.1.11.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require ccache.inc
2
3LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=80e92ec45d4fca91f127864fb9e5d932"
5
6SRC_URI[md5sum] = "0f6df80c8941d9020a1fd5df5ad57dd7"
7SRC_URI[sha256sum] = "60e9f3f1e60f528cfce910f3224bcc698029320f6ab77ec09a7b46bda2bc678e"
diff --git a/meta/recipes-devtools/ccache/ccache_3.2.3.bb b/meta/recipes-devtools/ccache/ccache_3.2.3.bb
new file mode 100644
index 0000000000..357df750b8
--- /dev/null
+++ b/meta/recipes-devtools/ccache/ccache_3.2.3.bb
@@ -0,0 +1,8 @@
1require ccache.inc
2
3LICENSE = "GPLv3+"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b3c337e7664559a789d9f7a93e5283c1"
5
6SRCREV = "4cad46e8ee0053144bb00919f0dadd20c1f87013"
7
8SRC_URI += "file://0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch"
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
new file mode 100644
index 0000000000..a8400d51b3
--- /dev/null
+++ b/meta/recipes-devtools/ccache/files/0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch
@@ -0,0 +1,73 @@
1From f74c76107933046309861680b741adc67ac2a34e Mon Sep 17 00:00:00 2001
2From: Joel Rosdahl <joel@rosdahl.net>
3Date: Mon, 17 Aug 2015 19:05:14 +0200
4Subject: [PATCH] Fix regression in recent change related to zlib in
5 nonstandard location
6
7To allow for specifying a -L flag in LDFLAGS and have it take effect for
8-lz, 0220de9c8ebfb18caae2ac1aa163d060e98ceade put -lz in extra_libs
9instead of extra_ldflags. However, extra_libs is supposed to contain
10paths to libraries which are prerequisites of the ccache link rule, and
11some older versions of make got confused by seeing -lz as a
12prerequisite.
13
14This fix is to revert 0220de9c8ebfb18caae2ac1aa163d060e98ceade and
15instead make sure that LDFLAGS comes before extra_ldflags.
16
17Upstream-status: Backport
18---
19 Makefile.in | 2 +-
20 NEWS.txt | 10 ++++++++++
21 configure.ac | 2 +-
22 3 files changed, 12 insertions(+), 2 deletions(-)
23
24diff --git a/Makefile.in b/Makefile.in
25index e7515b1..d3621cd 100644
26--- a/Makefile.in
27+++ b/Makefile.in
28@@ -20,7 +20,7 @@ RANLIB = @RANLIB@
29
30 all_cflags = $(CFLAGS)
31 all_cppflags = @DEFS@ @extra_cppflags@ -DSYSCONFDIR=$(sysconfdir) -I. -I$(srcdir) $(CPPFLAGS)
32-all_ldflags = @extra_ldflags@ $(LDFLAGS)
33+all_ldflags = $(LDFLAGS) @extra_ldflags@
34 extra_libs = @extra_libs@
35
36 base_sources = \
37diff --git a/NEWS.txt b/NEWS.txt
38index f13feeb..eaeadf6 100644
39--- a/NEWS.txt
40+++ b/NEWS.txt
41@@ -2,6 +2,16 @@ ccache news
42 ===========
43
44
45+Unreleased 3.2.4
46+----------------
47+
48+Bug fixes
49+~~~~~~~~~
50+
51+- Fixed build error related to zlib on systems with older make versions
52+ (regression in ccache 3.2.3).
53+
54+
55 ccache 3.2.3
56 ------------
57 Release date: 2015-08-16
58diff --git a/configure.ac b/configure.ac
59index 8d8ce92..9e65588 100644
60--- a/configure.ac
61+++ b/configure.ac
62@@ -120,7 +120,7 @@ if test x${use_bundled_zlib} = xyes; then
63 extra_libs="zlib/libz.a"
64 mkdir -p zlib
65 else
66- extra_libs="-lz"
67+ extra_ldflags="-lz"
68 fi
69
70 dnl Linking on Windows needs ws2_32
71--
722.1.4
73