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>
This commit is contained in:
Alexander Kanavin 2015-09-03 18:34:10 +03:00 committed by Richard Purdie
parent fac0d67ec2
commit d025e78cc1
4 changed files with 84 additions and 8 deletions

View File

@ -9,7 +9,9 @@ LICENSE = "GPLv3+"
DEPENDS = "zlib"
SRC_URI = "http://samba.org/ftp/ccache/ccache-${PV}.tar.xz"
SRC_URI = "git://git.samba.org/ccache.git"
S = "${WORKDIR}/git"
inherit autotools

View File

@ -1,7 +0,0 @@
require ccache.inc
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=80e92ec45d4fca91f127864fb9e5d932"
SRC_URI[md5sum] = "0f6df80c8941d9020a1fd5df5ad57dd7"
SRC_URI[sha256sum] = "60e9f3f1e60f528cfce910f3224bcc698029320f6ab77ec09a7b46bda2bc678e"

View File

@ -0,0 +1,8 @@
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"

View File

@ -0,0 +1,73 @@
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