Attachment #215193 for bug #234971




TINDERBOX_DESC=	Create tarball for tinderbox usage
MEMCACHED_DESC=	Build in experimental Memcached support

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 pkgconfig
MEMCACHED_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
MEMCACHED_LDFLAGS=		-L${LOCALBASE}/lib
MEMCACHED_CFLAGS=		-I${LOCALBASE}/include


.if ${PORT_OPTIONS:MMEMCACHED}
# Hack for libsasl2.a requiring HMAC_CTX_reset from hidden libntlm.a.
STATIC_LDFLAGS+=	-L${LOCALBASE}/lib/sasl2
PORTVERSION=	3.5.dev.20180926
USE_GITHUB=	yes
GH_TAGNAME=	f7712082106bef085515f86ae47e7dbbd2a48b57

PLIST_FILES+=	man/man1/ccache.1.gz
.endif
.else
PORTVERSION=	3.7.9
.endif

.include <bsd.port.pre.mk>

Lines 1-3 Link Here

(-)devel/ccache/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1558214189	1	TIMESTAMP = 1591183580
2	SHA256 (ccache-3.7.1.tar.gz) = e562fcdbe766406b6fe4bf97ce5c001d2be8a17465f33bcddefc9499bbb057d8	2	SHA256 (ccache-3.7.9.tar.gz) = 92838e2133c9e704fdab9ee2608dad86c99021278b9ac47d065aa8ff2ea8ce36
3	SIZE (ccache-3.7.1.tar.gz) = 498581	3	SIZE (ccache-3.7.9.tar.gz) = 503838




-bdrewery


--- 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;
 	}

 	free(name);
 	return result;
 }
@@ -2001,6 +2011,7 @@ calculate_common_hash(struct args *args, struct hash *
 		free(p);
 	}
 

 	// Possibly hash GCC_COLORS (for color diagnostics).
 	if (guessed_compiler == GUESSED_GCC) {
 		const char *gcc_colors = getenv("GCC_COLORS");
@@ -2009,6 +2020,7 @@ calculate_common_hash(struct args *args, struct hash *
 			hash_string(hash, gcc_colors);
 		}
 	}

 }
 
 // Update a hash sum with information specific to the direct and preprocessor
@@ -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) {

Return to bug 234971

Lines 33-45 Link Here

(-)devel/ccache/Makefile (-4 / +4 lines)
33	TINDERBOX_DESC= Create tarball for tinderbox usage	33	TINDERBOX_DESC= Create tarball for tinderbox usage
34	MEMCACHED_DESC= Build in experimental Memcached support	34	MEMCACHED_DESC= Build in experimental Memcached support
35		35
36	USES= compiler	36	USES= compiler gmake
37		37
38	MEMCACHED_EXTRA_PATCHES= \	38	MEMCACHED_EXTRA_PATCHES= \
39	${FILESDIR}/extra-patch-memcached-configure.ac \	39	${FILESDIR}/extra-patch-memcached-configure.ac \
40	${FILESDIR}/extra-patch-memcached-Makefile.in	40	${FILESDIR}/extra-patch-memcached-Makefile.in
41	MEMCACHED_CONFIGURE_ENABLE= memcached	41	MEMCACHED_CONFIGURE_ENABLE= memcached
42	MEMCACHED_USES= autoreconf gmake pkgconfig	42	MEMCACHED_USES= autoreconf pkgconfig
43	MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached	43	MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached
44	MEMCACHED_LDFLAGS= -L${LOCALBASE}/lib	44	MEMCACHED_LDFLAGS= -L${LOCALBASE}/lib
45	MEMCACHED_CFLAGS= -I${LOCALBASE}/include	45	MEMCACHED_CFLAGS= -I${LOCALBASE}/include
Lines 68-74 Link Here
68		68
69	.if ${PORT_OPTIONS:MMEMCACHED}	69	.if ${PORT_OPTIONS:MMEMCACHED}
70	# Hack for libsasl2.a requiring HMAC_CTX_reset from hidden libntlm.a.	70	# Hack for libsasl2.a requiring HMAC_CTX_reset from hidden libntlm.a.
71	STATIC_LDFLAGS+= -L${LOCALBASE}/lib/sasl2	71	STATIC_LDFLAGS+= -L${LOCALBASE}/lib/sasl2
72	PORTVERSION= 3.5.dev.20180926	72	PORTVERSION= 3.5.dev.20180926
73	USE_GITHUB= yes	73	USE_GITHUB= yes
74	GH_TAGNAME= f7712082106bef085515f86ae47e7dbbd2a48b57	74	GH_TAGNAME= f7712082106bef085515f86ae47e7dbbd2a48b57
Lines 80-86 Link Here
80	PLIST_FILES+= man/man1/ccache.1.gz	80	PLIST_FILES+= man/man1/ccache.1.gz
81	.endif	81	.endif
82	.else	82	.else
83	PORTVERSION= 3.7.1	83	PORTVERSION= 3.7.9
84	.endif	84	.endif
85		85
86	.include <bsd.port.pre.mk>	86	.include <bsd.port.pre.mk>

Lines 5-13 Link Here

(-)devel/ccache/files/patch-src__ccache.c (-6 / +6 lines)
5	-bdrewery	5	-bdrewery
6		6
7		7
8	--- src/ccache.c.orig 2018-03-25 13:24:05.000000000 -0700	8	--- src/ccache.c.orig 2020-03-29 14:11:45 UTC
9	+++ src/ccache.c 2018-06-26 11:44:03.336177000 -0700	9	+++ src/ccache.c
10	@@ -487,6 +487,16 @@ guess_compiler(const char *path)	10	@@ -579,6 +579,16 @@ guess_compiler(const char *path)
11	} else if (str_eq(name, "pump") \|\| str_eq(name, "distcc-pump")) {	11	} else if (str_eq(name, "pump") \|\| str_eq(name, "distcc-pump")) {
12	result = GUESSED_PUMP;	12	result = GUESSED_PUMP;
13	}	13	}
Lines 24-30 Link Here
24	free(name);	24	free(name);
25	return result;	25	return result;
26	}	26	}
27	@@ -1657,6 +1667,7 @@ calculate_common_hash(struct args *args, struct mdfour	27	@@ -2001,6 +2011,7 @@ calculate_common_hash(struct args args, struct hash
28	free(p);	28	free(p);
29	}	29	}
30		30
Lines 32-38 Link Here
32	// Possibly hash GCC_COLORS (for color diagnostics).	32	// Possibly hash GCC_COLORS (for color diagnostics).
33	if (guessed_compiler == GUESSED_GCC) {	33	if (guessed_compiler == GUESSED_GCC) {
34	const char *gcc_colors = getenv("GCC_COLORS");	34	const char *gcc_colors = getenv("GCC_COLORS");
35	@@ -1665,6 +1676,7 @@ calculate_common_hash(struct args *args, struct mdfour	35	@@ -2009,6 +2020,7 @@ calculate_common_hash(struct args args, struct hash
36	hash_string(hash, gcc_colors);	36	hash_string(hash, gcc_colors);
37	}	37	}
38	}	38	}
Lines 40-46 Link Here
40	}	40	}
41		41
42	// Update a hash sum with information specific to the direct and preprocessor	42	// Update a hash sum with information specific to the direct and preprocessor
43	@@ -1697,6 +1709,13 @@ calculate_object_hash(struct args *args, struct mdfour	43	@@ -2043,6 +2055,13 @@ calculate_object_hash(struct args args, struct args
44		44
45	// -Wl,... doesn't affect compilation (except for clang).	45	// -Wl,... doesn't affect compilation (except for clang).
46	if (str_startswith(args->argv[i], "-Wl,") && !is_clang) {	46	if (str_startswith(args->argv[i], "-Wl,") && !is_clang) {