svn commit: r468391 - in branches/2018Q2/devel/cxxtools: . files

[Jan Beich]

Author: jbeich
Date: Thu Apr 26 22:26:02 2018
New Revision: 468391
URL: https://svnweb.freebsd.org/changeset/ports/468391

Log:
  MFH: r468390
  
  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_type>::value' "Character type of basic_string_view must be a POD"
      static_assert(is_pod<value_type>::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<cxxtools::Char, std::__1::char_traits<cxxtools::Char> >' requested here
              *_os << std::endl;
                      ^
  
  Reported by:	pkg-fallout
  Approved by:	ports-secteam blanket

Added:
  branches/2018Q2/devel/cxxtools/files/patch-src_settingswriter.cpp
     - copied unchanged from r468390, head/devel/cxxtools/files/patch-src_settingswriter.cpp
Modified:
  branches/2018Q2/devel/cxxtools/Makefile
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/devel/cxxtools/Makefile
==============================================================================
--- branches/2018Q2/devel/cxxtools/Makefile	Thu Apr 26 22:22:58 2018	(r468390)
+++ branches/2018Q2/devel/cxxtools/Makefile	Thu Apr 26 22:26:02 2018	(r468391)
@@ -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

Copied: branches/2018Q2/devel/cxxtools/files/patch-src_settingswriter.cpp (from r468390, head/devel/cxxtools/files/patch-src_settingswriter.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q2/devel/cxxtools/files/patch-src_settingswriter.cpp	Thu Apr 26 22:26:02 2018	(r468391, copy of r468390, head/devel/cxxtools/files/patch-src_settingswriter.cpp)
@@ -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_type>::value' "Character type of basic_string_view must be a POD"
+    static_assert(is_pod<value_type>::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<cxxtools::Char, std::__1::char_traits<cxxtools::Char> >' 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");
+ }
+ 
+ }