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
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
14 This fix is to revert 0220de9c8ebfb18caae2ac1aa163d060e98ceade and
15 instead make sure that LDFLAGS comes before extra_ldflags.
17 Upstream-Status: Backport
20 NEWS.txt | 10 ++++++++++
22 3 files changed, 12 insertions(+), 2 deletions(-)
24 diff --git a/Makefile.in b/Makefile.in
25 index e7515b1..d3621cd 100644
28 @@ -20,7 +20,7 @@ RANLIB = @RANLIB@
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@
37 diff --git a/NEWS.txt b/NEWS.txt
38 index f13feeb..eaeadf6 100644
41 @@ -2,6 +2,16 @@ ccache news
51 +- Fixed build error related to zlib on systems with older make versions
52 + (regression in ccache 3.2.3).
57 Release date: 2015-08-16
58 diff --git a/configure.ac b/configure.ac
59 index 8d8ce92..9e65588 100644
62 @@ -120,7 +120,7 @@ if test x${use_bundled_zlib} = xyes; then
63 extra_libs="zlib/libz.a"
70 dnl Linking on Windows needs ws2_32