From 555f6586abf209a046ebf8002d89f1f8601f2cde Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Wed, 19 Aug 2015 12:41:44 -0400 Subject: [PATCH] net-ftp/filezilla: Replace C++14 check with simpler test-flag-CXX Package-Manager: portage-2.2.20_p134 --- net-ftp/filezilla/filezilla-3.13.0.ebuild | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/net-ftp/filezilla/filezilla-3.13.0.ebuild b/net-ftp/filezilla/filezilla-3.13.0.ebuild index 3f0e7a090ea6..2678ed5a89df 100644 --- a/net-ftp/filezilla/filezilla-3.13.0.ebuild +++ b/net-ftp/filezilla/filezilla-3.13.0.ebuild @@ -37,16 +37,13 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${PN}-${MY_PV} pkg_pretend() { -if [[ ${MERGE_TYPE} != binary ]]; then - echo 'int main() {return 0;}' > "${T}"/test.cxx || die - ebegin "Trying to build a C++14 test program" - if ! $(tc-getCXX) -std=c++14 -o /dev/null "${T}"/test.cxx; then + if [[ ${MERGE_TYPE} != binary ]]; then + if ! test-flag-CXX -std=c++14; then eerror "${P} requires C++14-capable C++ compiler. Your current compiler" eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" eerror "to gcc-4.9 or an equivalent version supporting C++14." die "Currently active compiler does not support -std=c++14" fi - eend ${?} fi } -- 2.26.2