svn commit: r433577 - in head/devel/ccache: . files
Bryan Drewery
bdrewery at FreeBSD.org
Tue Feb 7 18:28:17 UTC 2017
Author: bdrewery
Date: Tue Feb 7 18:28:16 2017
New Revision: 433577
URL: https://svnweb.freebsd.org/changeset/ports/433577
Log:
- Update to 3.3.3
Changes: https://ccache.samba.org/releasenotes.html#_ccache_3_3_3
Deleted:
head/devel/ccache/files/patch-conf.c
Modified:
head/devel/ccache/Makefile
head/devel/ccache/distinfo
head/devel/ccache/files/patch-ccache.c
Modified: head/devel/ccache/Makefile
==============================================================================
--- head/devel/ccache/Makefile Tue Feb 7 18:21:33 2017 (r433576)
+++ head/devel/ccache/Makefile Tue Feb 7 18:28:16 2017 (r433577)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ccache
-PORTVERSION= 3.2.9
+PORTVERSION= 3.3.3
CATEGORIES= devel
MASTER_SITES= http://www.samba.org/ftp/ccache/ \
LOCAL/bdrewery
Modified: head/devel/ccache/distinfo
==============================================================================
--- head/devel/ccache/distinfo Tue Feb 7 18:21:33 2017 (r433576)
+++ head/devel/ccache/distinfo Tue Feb 7 18:28:16 2017 (r433577)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486160032
-SHA256 (ccache-3.2.9.tar.gz) = 1e13961b83a3d215c4013469c149414a79312a22d3c7bf9f946abac9ee33e63f
-SIZE (ccache-3.2.9.tar.gz) = 447006
+TIMESTAMP = 1486160144
+SHA256 (ccache-3.3.3.tar.gz) = 87a399a2267cfac3f36411fbc12ff8959f408cffd050ad15fe423df88e977e8f
+SIZE (ccache-3.3.3.tar.gz) = 445931
Modified: head/devel/ccache/files/patch-ccache.c
==============================================================================
--- head/devel/ccache/files/patch-ccache.c Tue Feb 7 18:21:33 2017 (r433576)
+++ head/devel/ccache/files/patch-ccache.c Tue Feb 7 18:28:16 2017 (r433577)
@@ -4,49 +4,49 @@
already available.
-bdrewery
---- ccache.c.orig 2015-10-08 19:14:23 UTC
-+++ ccache.c
-@@ -1350,6 +1350,11 @@ compiler_is_clang(struct args *args)
+--- 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 is = strstr(name, "clang") != NULL;
+ bool result = strstr(name, "clang") != NULL;
+#ifdef CC_IS_CLANG
+ if (strcmp(name, "cc") == 0 || strcmp(name, "CC") == 0 ||
+ strcmp(name, "c++") == 0)
-+ is = true;
++ result = true;
+#endif
free(name);
- return is;
+ return result;
}
-@@ -1359,6 +1364,11 @@ compiler_is_gcc(struct args *args)
+@@ -1477,6 +1482,11 @@ compiler_is_gcc(struct args *args)
{
char *name = basename(args->argv[0]);
- bool is = strstr(name, "gcc") || strstr(name, "g++");
+ 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)
-+ is = true;
++ result = true;
+#endif
free(name);
- return is;
+ return result;
}
-@@ -1463,6 +1473,7 @@ calculate_common_hash(struct args *args,
+@@ -1592,6 +1602,7 @@ calculate_common_hash(struct args *args,
free(p);
}
+#if 0
- /* Possibly hash GCC_COLORS (for color diagnostics). */
+ // Possibly hash GCC_COLORS (for color diagnostics).
if (compiler_is_gcc(args)) {
const char *gcc_colors = getenv("GCC_COLORS");
-@@ -1471,6 +1482,7 @@ calculate_common_hash(struct args *args,
+@@ -1600,6 +1611,7 @@ calculate_common_hash(struct args *args,
hash_string(hash, gcc_colors);
}
}
+#endif
}
- /*
-@@ -1509,6 +1521,13 @@ calculate_object_hash(struct args *args,
+ // Update a hash sum with information specific to the direct and preprocessor
+@@ -1629,6 +1641,13 @@ calculate_object_hash(struct args *args,
continue;
}
@@ -57,6 +57,6 @@
+ continue;
+ }
+
- /* The -fdebug-prefix-map option may be used in combination with
- * CCACHE_BASEDIR to reuse results across different directories. Skip it
- * from hashing. */
+ // The -fdebug-prefix-map option may be used in combination with
+ // CCACHE_BASEDIR to reuse results across different directories. Skip it
+ // from hashing.
More information about the svn-ports-all
mailing list