From owner-svn-ports-all@freebsd.org Sat Jan 27 18:06:19 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE77CECEBB8; Sat, 27 Jan 2018 18:06:19 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6C8AF73317; Sat, 27 Jan 2018 18:06:19 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6113A60A9; Sat, 27 Jan 2018 18:06:19 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0RI6JAY032709; Sat, 27 Jan 2018 18:06:19 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0RI6JlJ032708; Sat, 27 Jan 2018 18:06:19 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201801271806.w0RI6JlJ032708@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sat, 27 Jan 2018 18:06:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460135 - head/shells/fish/files X-SVN-Group: ports-head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: head/shells/fish/files X-SVN-Commit-Revision: 460135 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jan 2018 18:06:19 -0000 Author: asomers (src committer) Date: Sat Jan 27 18:06:19 2018 New Revision: 460135 URL: https://svnweb.freebsd.org/changeset/ports/460135 Log: 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 Added: head/shells/fish/files/patch-src_common.h (contents, props changed) Added: head/shells/fish/files/patch-src_common.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/fish/files/patch-src_common.h Sat Jan 27 18:06:19 2018 (r460135) @@ -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