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:32:39 +0000 |
| commit | 50ca919beb7f954f85da0d5511ca8d7a6a2e7bce (patch) | |
| tree | 580e823d97628e088ea76e92d50c393e6a0c5203 /meta/recipes-devtools/ccache/files | |
| parent | 46320f6180d3003ace46c29f6f45a232e5be3af0 (diff) | |
| download | openembedded-core-50ca919beb7f954f85da0d5511ca8d7a6a2e7bce.tar.gz openembedded-core-50ca919beb7f954f85da0d5511ca8d7a6a2e7bce.tar.bz2 openembedded-core-50ca919beb7f954f85da0d5511ca8d7a6a2e7bce.zip | |
ccache: update to 3.2.4
Drop backported 0001-Fix-regression-in-recent-change-related-to-zlib-in-n.patch
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 @@ -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 - |