Date: Fri, 3 Feb 2017 21:59:16 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r433267 - in branches/2017Q1/devel/ccache: . files Message-ID: <201702032159.v13LxGW6005716@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Feb 3 21:59:16 2017 New Revision: 433267 URL: https://svnweb.freebsd.org/changeset/ports/433267 Log: MFH: r433266 - Fix regression from last commit with -Wp Obtained from: https://github.com/ccache/ccache/commit/3ba2ca78f9bad5b432b3ebe7095bd8bffbdf8a30 Approved by: portmgr (implicit) Added: branches/2017Q1/devel/ccache/files/patch-CCACHE_CPP2_Wp_MT-fix-Wp - copied unchanged from r433266, head/devel/ccache/files/patch-CCACHE_CPP2_Wp_MT-fix-Wp Modified: branches/2017Q1/devel/ccache/Makefile Directory Properties: branches/2017Q1/ (props changed) Modified: branches/2017Q1/devel/ccache/Makefile ============================================================================== --- branches/2017Q1/devel/ccache/Makefile Fri Feb 3 21:58:42 2017 (r433266) +++ branches/2017Q1/devel/ccache/Makefile Fri Feb 3 21:59:16 2017 (r433267) @@ -3,7 +3,7 @@ PORTNAME= ccache PORTVERSION= 3.2.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= http://www.samba.org/ftp/ccache/ \ LOCAL/bdrewery Copied: branches/2017Q1/devel/ccache/files/patch-CCACHE_CPP2_Wp_MT-fix-Wp (from r433266, head/devel/ccache/files/patch-CCACHE_CPP2_Wp_MT-fix-Wp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/devel/ccache/files/patch-CCACHE_CPP2_Wp_MT-fix-Wp Fri Feb 3 21:59:16 2017 (r433267, copy of r433266, head/devel/ccache/files/patch-CCACHE_CPP2_Wp_MT-fix-Wp) @@ -0,0 +1,23 @@ +diff --git a/ccache.c b/ccache.c +index 5635cc1..ddbc822 100644 +--- ccache.c ++++ ccache.c +@@ -2249,9 +2249,15 @@ cc_process_args(struct args *args, struct args **preprocessor_args, + output_dep = make_relative_path(x_strdup(argv[i] + 9)); + args_add(dep_args, argv[i]); + continue; +- } else if (str_startswith(argv[i], "-Wp,-M")) { +- /* -MF, -MP, -MQ, -MT, etc. TODO: Make argument to MF/MQ/MT +- * relative. */ ++ } else if (str_eq(argv[i], "-Wp,-MP") ++ || (strlen(argv[i]) > 8 ++ && str_startswith(argv[i], "-Wp,-M") ++ && argv[i][7] == ',' ++ && (argv[i][6] == 'F' ++ || argv[i][6] == 'Q' ++ || argv[i][6] == 'T') ++ && !strchr(argv[i] + 8, ','))) { ++ /* TODO: Make argument to MF/MQ/MT relative. */ + args_add(dep_args, argv[i]); + continue; + } else if (conf->direct_mode) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702032159.v13LxGW6005716>