From owner-svn-ports-head@freebsd.org Thu Apr 26 22:22:59 2018 Return-Path: Delivered-To: svn-ports-head@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 44555FB9D3B; Thu, 26 Apr 2018 22:22:59 +0000 (UTC) (envelope-from jbeich@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 D46F877F9A; Thu, 26 Apr 2018 22:22:58 +0000 (UTC) (envelope-from jbeich@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 C892B1E1CD; Thu, 26 Apr 2018 22:22:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3QMMwAm049955; Thu, 26 Apr 2018 22:22:58 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3QMMw0q049953; Thu, 26 Apr 2018 22:22:58 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804262222.w3QMMw0q049953@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 26 Apr 2018 22:22:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468390 - in head/devel/cxxtools: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/devel/cxxtools: . files X-SVN-Commit-Revision: 468390 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Apr 2018 22:22:59 -0000 Author: jbeich Date: Thu Apr 26 22:22:58 2018 New Revision: 468390 URL: https://svnweb.freebsd.org/changeset/ports/468390 Log: devel/cxxtools: unbreak with libc++ 6.0 In file included from settingswriter.cpp:28: In file included from ./settingswriter.h:31: In file included from ../include/cxxtools/char.h:32: In file included from /usr/include/c++/v1/string:477: /usr/include/c++/v1/string_view:211:5: error: static_assert failed due to requirement 'is_pod::value' "Character type of basic_string_view must be a POD" static_assert(is_pod::value, "Character type of basic_string_view must be a POD"); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ settingswriter.cpp:42:21: note: in instantiation of template class 'std::__1::basic_string_view >' requested here *_os << std::endl; ^ Reported by: pkg-fallout Added: head/devel/cxxtools/files/patch-src_settingswriter.cpp (contents, props changed) Modified: head/devel/cxxtools/Makefile (contents, props changed) Modified: head/devel/cxxtools/Makefile ============================================================================== --- head/devel/cxxtools/Makefile Thu Apr 26 22:11:31 2018 (r468389) +++ head/devel/cxxtools/Makefile Thu Apr 26 22:22:58 2018 (r468390) @@ -14,8 +14,6 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_aarch64= does not configure: error: check for atomictype failed -BROKEN_armv6= does not compile: string_view:204:5: error: static_assert failed "Character type of basic_string_view must be a POD" -BROKEN_armv7= does not compile: string_view:204:5: error: static_assert failed "Character type of basic_string_view must be a POD" BROKEN_mips= does not configure: in section .data.rel.ro of csvdeserializer-test.o: defined in discarded section BROKEN_mips64= does not configure: in section .data.rel.ro of csvdeserializer-test.o: defined in discarded section BROKEN_sparc64= does not configure Added: head/devel/cxxtools/files/patch-src_settingswriter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cxxtools/files/patch-src_settingswriter.cpp Thu Apr 26 22:22:58 2018 (r468390) @@ -0,0 +1,59 @@ +Regressed by https://reviews.llvm.org/rL297872 + +In file included from settingswriter.cpp:28: +In file included from ./settingswriter.h:31: +In file included from ../include/cxxtools/char.h:32: +In file included from /usr/include/c++/v1/string:477: +/usr/include/c++/v1/string_view:211:5: error: static_assert failed due to requirement 'is_pod::value' "Character type of basic_string_view must be a POD" + static_assert(is_pod::value, "Character type of basic_string_view must be a POD"); + ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ +settingswriter.cpp:42:21: note: in instantiation of template class 'std::__1::basic_string_view >' requested here + *_os << std::endl; + ^ + +--- src/settingswriter.cpp.orig 2013-12-26 09:33:48 UTC ++++ src/settingswriter.cpp +@@ -39,7 +39,7 @@ void SettingsWriter::write(const cxxtools::Serializati + String value; + it->getValue(value); + this->writeEntry( it->name(), value, it->typeName() ); +- *_os << std::endl; ++ *_os << cxxtools::String(L"\n"); + } + else if( it->category() == cxxtools::SerializationInfo::Object) + { +@@ -49,7 +49,7 @@ void SettingsWriter::write(const cxxtools::Serializati + *_os << cxxtools::String::widen( it->name() ) << cxxtools::String(L" = "); + *_os << cxxtools::String::widen( it->typeName() ) << cxxtools::String(L"{ "); + this->writeParent( *it, ""); +- *_os << cxxtools::String(L" }") << std::endl; ++ *_os << cxxtools::String(L" }") << cxxtools::String(L"\n"); + continue; + } + +@@ -71,14 +71,14 @@ void SettingsWriter::writeParent(const cxxtools::Seria + String value; + it->getValue(value); + this->writeEntry( it->name(), value, it->typeName() ); +- *_os << std::endl; ++ *_os << cxxtools::String(L"\n"); + } + else if( it->category() == cxxtools::SerializationInfo::Object ) + { + *_os << cxxtools::String::widen( prefix ) << '.' << cxxtools::String::widen( it->name() ) << cxxtools::String(L" = "); + *_os<< cxxtools::String::widen( it->typeName() ) << cxxtools::String(L"{ "); + this->writeChild(*it); +- *_os << cxxtools::String(L" }") << std::endl; ++ *_os << cxxtools::String(L" }") << cxxtools::String(L"\n"); + } + } + } +@@ -157,7 +157,7 @@ void SettingsWriter::writeEntry(const std::string& nam + + void SettingsWriter::writeSection(const cxxtools::String& prefix) + { +- *_os << cxxtools::String(L"[") << prefix << cxxtools::String(L"]") << std::endl; ++ *_os << cxxtools::String(L"[") << prefix << cxxtools::String(L"]") << cxxtools::String(L"\n"); + } + + }