svn commit: r473410 - in head/devel/ccache: . files
Bryan Drewery
bdrewery at FreeBSD.org
Tue Jun 26 21:15:49 UTC 2018
Author: bdrewery
Date: Tue Jun 26 21:15:47 2018
New Revision: 473410
URL: https://svnweb.freebsd.org/changeset/ports/473410
Log:
- Update to 3.4.2
- MEMCACHED: Switch to github development branch for memcached
- Fix memcached (non-static) linking in libsasl, libopie, libcrypto when
unneeded (files/extra-patch-memcached-configure.ac).
- Fix CONFLICTS_INSTALL causing slave ports to conflict on themselves.
- DOCS: Add NEWS files
Added:
head/devel/ccache/distinfo.memcached (contents, props changed)
head/devel/ccache/files/patch-src__ccache.c
- copied, changed from r473409, head/devel/ccache/files/patch-ccache.c
Deleted:
head/devel/ccache/files/extra-patch-memcached
head/devel/ccache/files/extra-patch-memcached-ccache.c
head/devel/ccache/files/patch-ccache.c
head/devel/ccache/files/patch-configure
Modified:
head/devel/ccache/Makefile
head/devel/ccache/distinfo
head/devel/ccache/files/extra-patch-memcached-configure.ac
Modified: head/devel/ccache/Makefile
==============================================================================
--- head/devel/ccache/Makefile Tue Jun 26 20:40:08 2018 (r473409)
+++ head/devel/ccache/Makefile Tue Jun 26 21:15:47 2018 (r473410)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= ccache
-PORTVERSION= 3.3.5
-PORTREVISION= 2
+PORTVERSION= 3.4.2
+PORTREVISION= 0
CATEGORIES= devel
MASTER_SITES= https://www.samba.org/ftp/ccache/ \
LOCAL/bdrewery
@@ -14,7 +14,7 @@ COMMENT= Tool to minimize the compile time of C/C++ pr
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/GPL-3.0.txt
-CONFLICTS_INSTALL= ccache-static-[0-9]* ccache-memcached-[0-9]* ccache-memcached-static-[0-9]*
+CONFLICTS_INSTALL?= ccache-static-[0-9]* ccache-memcached-[0-9]* ccache-memcached-static-[0-9]*
GNU_CONFIGURE= yes
@@ -22,7 +22,8 @@ HOWTO= ccache-howto-freebsd.txt
CCLINKDIR= libexec/ccache
SUB_FILES= ${HOWTO} world-ccache pkg-message ccache-update-links.sh
-PORTDOCS= ccache-howto-freebsd.txt MANUAL.html MANUAL.txt
+PORTDOCS= ccache-howto-freebsd.txt MANUAL.html MANUAL.adoc NEWS.adoc \
+ NEWS.html
OPTIONS_DEFINE= CLANGLINK LLVMLINK STATIC DOCS TINDERBOX MEMCACHED
OPTIONS_DEFAULT=CLANGLINK LLVMLINK
@@ -34,12 +35,11 @@ MEMCACHED_DESC= Build in experimental Memcached suppor
USES= compiler
-MEMCACHED_EXTRA_PATCHES= ${FILESDIR}/extra-patch-memcached:-p1 \
- ${FILESDIR}/extra-patch-memcached-ccache.c \
+MEMCACHED_EXTRA_PATCHES= \
${FILESDIR}/extra-patch-memcached-configure.ac \
${FILESDIR}/extra-patch-memcached-Makefile.in
MEMCACHED_CONFIGURE_ENABLE= memcached
-MEMCACHED_USES= autoreconf pkgconfig
+MEMCACHED_USES= autoreconf gmake pkgconfig
MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached
MEMCACHED_LDFLAGS= -L${LOCALBASE}/lib
MEMCACHED_CFLAGS= -I${LOCALBASE}/include
@@ -64,6 +64,17 @@ OPTIONS_SUB= yes
STATIC_LDFLAGS= -static
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMEMCACHED}
+USE_GITHUB= yes
+GH_TAGNAME= dd9123d3bc0763ef7133330e20ca3e3409a08904
+MASTER_SITES=
+DISTINFO_FILE= ${MASTERDIR}/distinfo.memcached
+BUILD_DEPENDS+= ${LOCALBASE}/bin/a2x:textproc/asciidoc
+ALL_TARGET= all docs
+.endif
+
.include <bsd.port.pre.mk>
. if ${COMPILER_TYPE} == clang
@@ -96,6 +107,12 @@ SUB_LIST+= CCACHE_COMPILERS="${CCACHE_COMPILERS}" \
ICCPREFIX="${LOCALBASE}/intel_cc_80/bin" \
HOWTO="${HOWTO}"
+post-patch-MEMCACHED-off:
+ @${REINPLACE_CMD} \
+ -e 's,_XOPEN_SOURCE 600,_XOPEN_SOURCE 700,' \
+ -e 's,_POSIX_C_SOURCE 200112L,_POSIX_C_SOURCE 200809L,' \
+ ${WRKSRC}/configure
+
post-build-TINDERBOX-on:
@${MKDIR} ${WRKDIR}/tb/opt
@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${WRKDIR}/tb/opt
@@ -106,7 +123,7 @@ post-build-TINDERBOX-on:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ccache ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/ccache.1 ${STAGEDIR}${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/doc/ccache.1 ${STAGEDIR}${PREFIX}/man/man1
${MKDIR} ${STAGEDIR}${PREFIX}/${CCLINKDIR}/world
${INSTALL_SCRIPT} ${WRKDIR}/world-ccache \
${STAGEDIR}${PREFIX}/${CCLINKDIR}/world/ccache
@@ -119,8 +136,10 @@ do-install-TINDERBOX-on:
do-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/MANUAL.html ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/MANUAL.txt ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/MANUAL.html ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/MANUAL.adoc ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/NEWS.adoc ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/NEWS.html ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKDIR}/${HOWTO} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.post.mk>
Modified: head/devel/ccache/distinfo
==============================================================================
--- head/devel/ccache/distinfo Tue Jun 26 20:40:08 2018 (r473409)
+++ head/devel/ccache/distinfo Tue Jun 26 21:15:47 2018 (r473410)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516823791
-SHA256 (ccache-3.3.5.tar.gz) = c84b2460dab2bd9b8b743499a51910c6b7149bc0271d0f6000e0ad1f6c8fda2b
-SIZE (ccache-3.3.5.tar.gz) = 453896
+TIMESTAMP = 1530039944
+SHA256 (ccache-3.4.2.tar.gz) = b2264923c63e2b90a17cf56acb1df3f4229c416fb88e476e5ec7e02919d319c3
+SIZE (ccache-3.4.2.tar.gz) = 460637
Added: head/devel/ccache/distinfo.memcached
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ccache/distinfo.memcached Tue Jun 26 21:15:47 2018 (r473410)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1530040182
+SHA256 (ccache-ccache-3.4.2-dd9123d3bc0763ef7133330e20ca3e3409a08904_GH0.tar.gz) = 842b55b091f21878c4d4eb3900fa7501f632af5d39d42b5cb81ce47d231da40f
+SIZE (ccache-ccache-3.4.2-dd9123d3bc0763ef7133330e20ca3e3409a08904_GH0.tar.gz) = 358431
Modified: head/devel/ccache/files/extra-patch-memcached-configure.ac
==============================================================================
--- head/devel/ccache/files/extra-patch-memcached-configure.ac Tue Jun 26 20:40:08 2018 (r473409)
+++ head/devel/ccache/files/extra-patch-memcached-configure.ac Tue Jun 26 21:15:47 2018 (r473410)
@@ -30,7 +30,7 @@
- echo ' please install libmemcached > 1.0 with development files'
- exit 1
- ])
-+ if test x${enable_static} != x; then
++ if test x${enable_static} = xyes; then
+ AC_CHECK_LIB(sasl2, sasl_version, ac_cv_have_libsasl2=yes,
+ ac_cv_have_libsasl2=no, -lcrypto -lopie -lmd)
+ fi
Copied and modified: head/devel/ccache/files/patch-src__ccache.c (from r473409, head/devel/ccache/files/patch-ccache.c)
==============================================================================
--- head/devel/ccache/files/patch-ccache.c Tue Jun 26 20:40:08 2018 (r473409, copy source)
+++ head/devel/ccache/files/patch-src__ccache.c Tue Jun 26 21:15:47 2018 (r473410)
@@ -4,41 +4,35 @@
already available.
-bdrewery
---- ccache.c.orig 2016-10-26 14:31:19.000000000 -0700
-+++ ccache.c 2017-02-03 14:24:35.466505000 -0800
-@@ -1468,6 +1468,11 @@ compiler_is_clang(struct args *args)
- {
- char *name = basename(args->argv[0]);
- bool result = strstr(name, "clang") != NULL;
-+#ifdef CC_IS_CLANG
-+ if (strcmp(name, "cc") == 0 || strcmp(name, "CC") == 0 ||
-+ strcmp(name, "c++") == 0)
-+ result = true;
+
+--- 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)
+ } else if (str_eq(name, "pump") || str_eq(name, "distcc-pump")) {
+ result = GUESSED_PUMP;
+ }
++#if defined(CC_IS_CLANG) || defined(CC_IS_GCC)
++ if (result == GUESSED_UNKNOWN &&
++ (strcmp(name, "cc") == 0 || strcmp(name, "CC") == 0 ||
++ strcmp(name, "c++") == 0))
++#if defined(CC_IS_CLANG)
++ result = GUESSED_CLANG;
++#elif defined(CC_IS_GCC)
++ result = GUESSED_GCC;
+#endif
- free(name);
- return result;
- }
-@@ -1477,6 +1482,11 @@ compiler_is_gcc(struct args *args)
- {
- char *name = basename(args->argv[0]);
- bool result = strstr(name, "gcc") || strstr(name, "g++");
-+#ifdef CC_IS_GCC
-+ if (strcmp(name, "cc") == 0 || strcmp(name, "CC") == 0 ||
-+ strcmp(name, "c++") == 0)
-+ result = true;
+#endif
free(name);
return result;
}
-@@ -1592,6 +1602,7 @@ calculate_common_hash(struct args *args,
+@@ -1657,6 +1667,7 @@ calculate_common_hash(struct args *args, struct mdfour
free(p);
}
+#if 0
// Possibly hash GCC_COLORS (for color diagnostics).
- if (compiler_is_gcc(args)) {
+ if (guessed_compiler == GUESSED_GCC) {
const char *gcc_colors = getenv("GCC_COLORS");
-@@ -1600,6 +1611,7 @@ calculate_common_hash(struct args *args,
+@@ -1665,6 +1676,7 @@ calculate_common_hash(struct args *args, struct mdfour
hash_string(hash, gcc_colors);
}
}
@@ -46,17 +40,17 @@
}
// Update a hash sum with information specific to the direct and preprocessor
-@@ -1629,6 +1641,13 @@ calculate_object_hash(struct args *args,
- continue;
- }
+@@ -1697,6 +1709,13 @@ calculate_object_hash(struct args *args, struct mdfour
+ // -Wl,... doesn't affect compilation (except for clang).
+ if (str_startswith(args->argv[i], "-Wl,") && !is_clang) {
++ continue;
++ }
++
+ /* Colors do not affect compilation. */
+ if (str_startswith(args->argv[i], "-fcolor-diagnostics") ||
+ str_eq(args->argv[i], "-fdiagnostics-color") ||
+ str_eq(args->argv[i], "-fdiagnostics-color=always")) {
-+ continue;
-+ }
-+
- // The -fdebug-prefix-map option may be used in combination with
- // CCACHE_BASEDIR to reuse results across different directories. Skip it
- // from hashing.
+ continue;
+ }
+
More information about the svn-ports-all
mailing list