svn commit: r431185 - in branches/2017Q1/www/chromium: . files

[Carlos J. Puga Medina]

Author: cpm
Date: Wed Jan 11 15:04:03 2017
New Revision: 431185
URL: https://svnweb.freebsd.org/changeset/ports/431185

Log:
  MFH: r431170
  
  - Fix build on HEAD
  
  In file included from ../../services/ui/ws/window_manager_state.cc:5:
  In file included from ../../services/ui/ws/window_manager_state.h:10:
  In file included from /usr/include/c++/v1/memory:599:
  /usr/include/c++/v1/__config:58:2: error: "_LIBCPP_TRIVIAL_PAIR_COPY_CTOR" is no longer supported.     use _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR instead
  #error "_LIBCPP_TRIVIAL_PAIR_COPY_CTOR" is no longer supported. \
   ^
  1 error generated.
  
  PR:		214654
  Submitted by:	dim
  Reported by:	jbeich
  Reviewed by:	rene
  Approved by:	chromium (rene)
  
  Approved by:	ports-secteam (feld)

Added:
  branches/2017Q1/www/chromium/files/extra-patch-libc++-new
     - copied unchanged from r431170, head/www/chromium/files/extra-patch-libc++-new
  branches/2017Q1/www/chromium/files/extra-patch-libc++-old
     - copied unchanged from r431170, head/www/chromium/files/extra-patch-libc++-old
Modified:
  branches/2017Q1/www/chromium/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/www/chromium/Makefile
==============================================================================
--- branches/2017Q1/www/chromium/Makefile	Wed Jan 11 14:58:06 2017	(r431184)
+++ branches/2017Q1/www/chromium/Makefile	Wed Jan 11 15:04:03 2017	(r431185)
@@ -187,10 +187,10 @@ GN_ARGS+=	is_clang=true
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002000
-BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
-GN_ARGS+=	extra_cxxflags="-stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1" \
-		extra_ldflags="-L${LOCALBASE}/lib"
+.if ${OSVERSION} < 1200017
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libc++-old
+.else
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libc++-new
 .endif
 
 .if ${OSVERSION} < 1100000

Copied: branches/2017Q1/www/chromium/files/extra-patch-libc++-new (from r431170, head/www/chromium/files/extra-patch-libc++-new)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/www/chromium/files/extra-patch-libc++-new	Wed Jan 11 15:04:03 2017	(r431185, copy of r431170, head/www/chromium/files/extra-patch-libc++-new)
@@ -0,0 +1,14 @@
+--- services/ui/ws/BUILD.gn.orig	2016-12-09 17:47:26.343517000 +0000
++++ services/ui/ws/BUILD.gn	2016-12-09 17:48:45.323876000 +0000
+@@ -103,6 +103,11 @@
+     "window_tree_host_factory.h",
+   ]
+ 
++  # Work around base r261801
++  if (is_bsd) {
++    defines = ["_LIBCPP_ABI_UNSTABLE=1"]
++  }
++
+   deps = [
+     # TODO(sad): Temporary, until the GPU process is split out of ws.
+     "//services/ui/gpu",

Copied: branches/2017Q1/www/chromium/files/extra-patch-libc++-old (from r431170, head/www/chromium/files/extra-patch-libc++-old)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/www/chromium/files/extra-patch-libc++-old	Wed Jan 11 15:04:03 2017	(r431185, copy of r431170, head/www/chromium/files/extra-patch-libc++-old)
@@ -0,0 +1,14 @@
+--- services/ui/ws/BUILD.gn.orig	2016-12-09 17:47:26.343517000 +0000
++++ services/ui/ws/BUILD.gn	2016-12-09 17:50:06.387679000 +0000
+@@ -103,6 +103,11 @@
+     "window_tree_host_factory.h",
+   ]
+ 
++  # Work around base r261801
++  if (is_bsd) {
++    defines = ["_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1"]
++  }
++
+   deps = [
+     # TODO(sad): Temporary, until the GPU process is split out of ws.
+     "//services/ui/gpu",