aboutsummaryrefslogtreecommitdiffstats
path: root/shells/fish
diff options
context:
space:
mode:
authorAlan Somers <asomers@FreeBSD.org>2018-01-28 02:06:19 +0800
committerAlan Somers <asomers@FreeBSD.org>2018-01-28 02:06:19 +0800
commitfc7345d31fbb8ccf87467ccef56277f012f6184c (patch)
tree76f8ba8c24ab3a27063d7c3afb22e64a598a6ffe /shells/fish
parentbdeaed961eeb840f933374df1ae1793a1f285d32 (diff)
downloadfreebsd-ports-gnome-fc7345d31fbb8ccf87467ccef56277f012f6184c.tar.gz
freebsd-ports-gnome-fc7345d31fbb8ccf87467ccef56277f012f6184c.tar.zst
freebsd-ports-gnome-fc7345d31fbb8ccf87467ccef56277f012f6184c.zip
shells/fish: fix the build with Clang-6.0
Clang-6.0 on FreeBSD 12 doesn't define __cpp_lib_make_unique. Patch fish to key off of the value of __cplusplus instead. PR: 225456 Reported by: pkg-fallout Reviewed by: jbeich, dim Differential Revision: https://reviews.freebsd.org/D14058
Diffstat (limited to 'shells/fish')
-rw-r--r--shells/fish/files/patch-src_common.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/shells/fish/files/patch-src_common.h b/shells/fish/files/patch-src_common.h
new file mode 100644
index 000000000000..b544112bdbe7
--- /dev/null
+++ b/shells/fish/files/patch-src_common.h
@@ -0,0 +1,11 @@
+--- src/common.h.orig 2018-01-26 20:48:40 UTC
++++ src/common.h
+@@ -658,7 +658,7 @@ wcstring vformat_string(const wchar_t *format, va_list
+ void append_format(wcstring &str, const wchar_t *format, ...);
+ void append_formatv(wcstring &str, const wchar_t *format, va_list ap);
+
+-#ifdef __cpp_lib_make_unique
++#if __cplusplus >= 201402L
+ using std::make_unique;
+ #else
+ /// make_unique implementation