Attachment 215193 Details for Bug 234971 – svn diff for ccache 3.7.1->3.7.9 update

[patch] svn diff for ccache 3.7.1->3.7.9 update

ccache-3.7.1-3.7.9.patch (text/plain), 3.30 KB, created by Oleg Sidorkin on 2020-06-03 13:17:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Sidorkin

Created: 2020-06-03 13:17:28 UTC

Size: 3.30 KB

patch

obsolete

>Index: devel/ccache/Makefile
>===================================================================
>--- devel/ccache/Makefile	(revision 537562)
>+++ devel/ccache/Makefile	(working copy)
>@@ -33,13 +33,13 @@
> TINDERBOX_DESC=	Create tarball for tinderbox usage
> MEMCACHED_DESC=	Build in experimental Memcached support
> 
>-USES=		compiler
>+USES=		compiler gmake
> 
> MEMCACHED_EXTRA_PATCHES=	\
> 				${FILESDIR}/extra-patch-memcached-configure.ac \
> 				${FILESDIR}/extra-patch-memcached-Makefile.in
> MEMCACHED_CONFIGURE_ENABLE=	memcached
>-MEMCACHED_USES=			autoreconf gmake pkgconfig
>+MEMCACHED_USES=			autoreconf pkgconfig
> MEMCACHED_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
> MEMCACHED_LDFLAGS=		-L${LOCALBASE}/lib
> MEMCACHED_CFLAGS=		-I${LOCALBASE}/include
>@@ -68,7 +68,7 @@
> 
> .if ${PORT_OPTIONS:MMEMCACHED}
> # Hack for libsasl2.a requiring HMAC_CTX_reset from hidden libntlm.a.
>-STATIC_LDFLAGS+= -L${LOCALBASE}/lib/sasl2
>+STATIC_LDFLAGS+=	-L${LOCALBASE}/lib/sasl2
> PORTVERSION=	3.5.dev.20180926
> USE_GITHUB=	yes
> GH_TAGNAME=	f7712082106bef085515f86ae47e7dbbd2a48b57
>@@ -80,7 +80,7 @@
> PLIST_FILES+=	man/man1/ccache.1.gz
> .endif
> .else
>-PORTVERSION=	3.7.1
>+PORTVERSION=	3.7.9
> .endif
> 
> .include <bsd.port.pre.mk>
>Index: devel/ccache/distinfo
>===================================================================
>--- devel/ccache/distinfo	(revision 537562)
>+++ devel/ccache/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1558214189
>-SHA256 (ccache-3.7.1.tar.gz) = e562fcdbe766406b6fe4bf97ce5c001d2be8a17465f33bcddefc9499bbb057d8
>-SIZE (ccache-3.7.1.tar.gz) = 498581
>+TIMESTAMP = 1591183580
>+SHA256 (ccache-3.7.9.tar.gz) = 92838e2133c9e704fdab9ee2608dad86c99021278b9ac47d065aa8ff2ea8ce36
>+SIZE (ccache-3.7.9.tar.gz) = 503838
>Index: devel/ccache/files/patch-src__ccache.c
>===================================================================
>--- devel/ccache/files/patch-src__ccache.c	(revision 537562)
>+++ devel/ccache/files/patch-src__ccache.c	(working copy)
>@@ -5,9 +5,9 @@
> -bdrewery
> 
> 
>---- src/ccache.c.orig	2018-03-25 13:24:05.000000000 -0700
>-+++ src/ccache.c	2018-06-26 11:44:03.336177000 -0700
>-@@ -487,6 +487,16 @@ guess_compiler(const char *path)
>+--- src/ccache.c.orig	2020-03-29 14:11:45 UTC
>++++ src/ccache.c
>+@@ -579,6 +579,16 @@ guess_compiler(const char *path)
>  	} else if (str_eq(name, "pump") || str_eq(name, "distcc-pump")) {
>  		result = GUESSED_PUMP;
>  	}
>@@ -24,7 +24,7 @@
>  	free(name);
>  	return result;
>  }
>-@@ -1657,6 +1667,7 @@ calculate_common_hash(struct args *args, struct mdfour
>+@@ -2001,6 +2011,7 @@ calculate_common_hash(struct args *args, struct hash *
>  		free(p);
>  	}
>  
>@@ -32,7 +32,7 @@
>  	// Possibly hash GCC_COLORS (for color diagnostics).
>  	if (guessed_compiler == GUESSED_GCC) {
>  		const char *gcc_colors = getenv("GCC_COLORS");
>-@@ -1665,6 +1676,7 @@ calculate_common_hash(struct args *args, struct mdfour
>+@@ -2009,6 +2020,7 @@ calculate_common_hash(struct args *args, struct hash *
>  			hash_string(hash, gcc_colors);
>  		}
>  	}
>@@ -40,7 +40,7 @@
>  }
>  
>  // Update a hash sum with information specific to the direct and preprocessor
>-@@ -1697,6 +1709,13 @@ calculate_object_hash(struct args *args, struct mdfour
>+@@ -2043,6 +2055,13 @@ calculate_object_hash(struct args *args, struct args *
>  
>  		// -Wl,... doesn't affect compilation (except for clang).
>  		if (str_startswith(args->argv[i], "-Wl,") && !is_clang) {

Actions: View | Diff

Attachments on bug 234971: 211253 | 215193 | 220025 | 234077 | 240819 | 240831 | 244932