diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2017-02-04 05:58:42 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2017-02-04 05:58:42 +0800 |
| commit | f113712ed586e22bc577e69fa4a170cea825dcd2 (patch) | |
| tree | d57736cee070a18be4c8d082da485d6101974446 /devel | |
| parent | 1e909d3a9aff6a34f774520bfa689963cf20f97c (diff) | |
| download | freebsd-ports-gnome-f113712ed586e22bc577e69fa4a170cea825dcd2.tar.gz freebsd-ports-gnome-f113712ed586e22bc577e69fa4a170cea825dcd2.tar.zst freebsd-ports-gnome-f113712ed586e22bc577e69fa4a170cea825dcd2.zip | |
- Fix regression from last commit with -Wp
Obtained from: https://github.com/ccache/ccache/commit/3ba2ca78f9bad5b432b3ebe7095bd8bffbdf8a30
MFH: 2017Q1
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ccache/Makefile | 2 | ||||
| -rw-r--r-- | devel/ccache/files/patch-CCACHE_CPP2_Wp_MT-fix-Wp | 23 |
2 files changed, 24 insertions, 1 deletions
diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile index fbed6b4401b5..dd30e6a9d692 100644 --- a/devel/ccache/Makefile +++ b/devel/ccache/Makefile @@ -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 diff --git a/devel/ccache/files/patch-CCACHE_CPP2_Wp_MT-fix-Wp b/devel/ccache/files/patch-CCACHE_CPP2_Wp_MT-fix-Wp new file mode 100644 index 000000000000..96038da238fb --- /dev/null +++ b/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) { |