[139884] trunk/dports/devel/ccache-devel

[ryandesign at macports.org]

Revision: 139884
          https://trac.macports.org/changeset/139884
Author:   ryandesign at macports.org
Date:     2015-08-31 06:28:58 -0700 (Mon, 31 Aug 2015)
Log Message:
-----------
ccache-devel: update to 3.2.3

Modified Paths:
--------------
    trunk/dports/devel/ccache-devel/Portfile

Added Paths:
-----------
    trunk/dports/devel/ccache-devel/files/patch-lz.diff

Modified: trunk/dports/devel/ccache-devel/Portfile
===================================================================
--- trunk/dports/devel/ccache-devel/Portfile	2015-08-31 13:27:48 UTC (rev 139883)
+++ trunk/dports/devel/ccache-devel/Portfile	2015-08-31 13:28:58 UTC (rev 139884)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        jrosdahl ccache 3.2.2 v
+github.setup        jrosdahl ccache 3.2.3 v
 name                ccache-devel
 epoch               1
 categories          devel
@@ -23,8 +23,8 @@
 
 homepage            http://ccache.samba.org/
 
-checksums           rmd160  35b2f9464f51a16fd2e0eb6843838653a504aa82 \
-                    sha256  865adc726c1b525b10647bd41055a288e2c81ca968fc0e25d36b97ee5ec2eb22
+checksums           rmd160  acf3d48dfdb6ad7be3732bfd609518ce5a48d20b \
+                    sha256  b1f7b71503bb551ea25a559447337b433c78750dd209c449b8ba93954e748e68
 
 depends_build       port:asciidoc \
                     port:autoconf \
@@ -35,6 +35,7 @@
 depends_lib         port:zlib
 
 patchfiles          patch-dev.mk.in.diff
+patchfiles-append   patch-lz.diff
 
 post-patch {
     reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/dev.mk.in

Added: trunk/dports/devel/ccache-devel/files/patch-lz.diff
===================================================================
--- trunk/dports/devel/ccache-devel/files/patch-lz.diff	                        (rev 0)
+++ trunk/dports/devel/ccache-devel/files/patch-lz.diff	2015-08-31 13:28:58 UTC (rev 139884)
@@ -0,0 +1,57 @@
+From: Joel Rosdahl <joel at rosdahl.net>
+Date: Mon, 17 Aug 2015 17:05:14 +0000 (+0200)
+Subject: Fix regression in recent change related to zlib in nonstandard location
+X-Git-Url: https://git.samba.org/?p=ccache.git;a=commitdiff_plain;h=f74c76107933046309861680b741adc67ac2a34e
+
+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.
+--- Makefile.in.orig
++++ 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 = \
+--- NEWS.txt.orig
++++ 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
+--- configure.ac.orig
++++ 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150831/1c87c1f0/attachment.html>