diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-02-24 16:06:26 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-28 11:33:04 +0000 |
commit | b8a1e599c0f47c34c3454b8cabd00d8e9eab9b66 (patch) | |
tree | 76340ff4f597fbaf43c467430fa7a15b3f807823 /meta/recipes-devtools/ccache/files | |
parent | 4d4aa1f091528c37df13f0782f9302471e71a77e (diff) | |
download | poky-b8a1e599c0f47c34c3454b8cabd00d8e9eab9b66.tar.gz |
ccache: update to 3.2.4
Drop backported 0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch
(From OE-Core rev: 50ca919beb7f954f85da0d5511ca8d7a6a2e7bce)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/ccache/files')
-rw-r--r-- | meta/recipes-devtools/ccache/files/0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch | 73 |
1 files changed, 0 insertions, 73 deletions
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 @@ | |||
1 | From f74c76107933046309861680b741adc67ac2a34e Mon Sep 17 00:00:00 2001 | ||
2 | From: Joel Rosdahl <joel@rosdahl.net> | ||
3 | Date: Mon, 17 Aug 2015 19:05:14 +0200 | ||
4 | Subject: [PATCH] Fix regression in recent change related to zlib in | ||
5 | nonstandard location | ||
6 | |||
7 | To allow for specifying a -L flag in LDFLAGS and have it take effect for | ||
8 | -lz, 0220de9c8ebfb18caae2ac1aa163d060e98ceade put -lz in extra_libs | ||
9 | instead of extra_ldflags. However, extra_libs is supposed to contain | ||
10 | paths to libraries which are prerequisites of the ccache link rule, and | ||
11 | some older versions of make got confused by seeing -lz as a | ||
12 | prerequisite. | ||
13 | |||
14 | This fix is to revert 0220de9c8ebfb18caae2ac1aa163d060e98ceade and | ||
15 | instead make sure that LDFLAGS comes before extra_ldflags. | ||
16 | |||
17 | Upstream-Status: Backport | ||
18 | --- | ||
19 | Makefile.in | 2 +- | ||
20 | NEWS.txt | 10 ++++++++++ | ||
21 | configure.ac | 2 +- | ||
22 | 3 files changed, 12 insertions(+), 2 deletions(-) | ||
23 | |||
24 | diff --git a/Makefile.in b/Makefile.in | ||
25 | index 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 = \ | ||
37 | diff --git a/NEWS.txt b/NEWS.txt | ||
38 | index 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 | ||
58 | diff --git a/configure.ac b/configure.ac | ||
59 | index 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 | -- | ||
72 | 2.1.4 | ||
73 | |||