From owner-svn-ports-all@FreeBSD.ORG Sun Oct 13 22:18:05 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6D0186F1; Sun, 13 Oct 2013 22:18:05 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4B4782A30; Sun, 13 Oct 2013 22:18:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9DMI5ZA042552; Sun, 13 Oct 2013 22:18:05 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9DMI4sN042546; Sun, 13 Oct 2013 22:18:04 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201310132218.r9DMI4sN042546@svn.freebsd.org> From: Rene Ladan Date: Sun, 13 Oct 2013 22:18:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330261 - in head/www/chromium: . files X-SVN-Group: ports-head 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.14 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: Sun, 13 Oct 2013 22:18:05 -0000 Author: rene Date: Sun Oct 13 22:18:04 2013 New Revision: 330261 URL: http://svnweb.freebsd.org/changeset/ports/330261 Log: Fix build on FreeBSD >= 1000052 when the user has installed devel/libexecinfo Reported by: Sam Fourman Jr Tested by: Ivan Klymenko Added: head/www/chromium/files/patch-v8__src__platform-posix.h (contents, props changed) Modified: head/www/chromium/Makefile head/www/chromium/files/extra-patch-fixup-execinfo Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Sun Oct 13 22:16:20 2013 (r330260) +++ head/www/chromium/Makefile Sun Oct 13 22:18:04 2013 (r330261) @@ -29,8 +29,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${ ninja:${PORTSDIR}/devel/ninja \ v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ - libcairo.so:${PORTSDIR}/graphics/cairo \ +LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libdbus-1.so:${PORTSDIR}/devel/dbus \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libasound.so:${PORTSDIR}/audio/alsa-lib \ @@ -143,9 +142,12 @@ GYP_DEFINES+= clang=1 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang .endif -.if ${OSVERSION} >= 1000052 +.if ${OSVERSION} >= 1000052 && !exists(${LOCALBASE}/include/execinfo.h) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-execinfo .endif +.if ${OSVERSION} < 1000052 +LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo +.endif .if ${PORT_OPTIONS:MTEST} TEST_TARGETS= base_unittests \ Modified: head/www/chromium/files/extra-patch-fixup-execinfo ============================================================================== --- head/www/chromium/files/extra-patch-fixup-execinfo Sun Oct 13 22:16:20 2013 (r330260) +++ head/www/chromium/files/extra-patch-fixup-execinfo Sun Oct 13 22:18:04 2013 (r330261) @@ -1,13 +1,5 @@ --- v8/src/platform-posix.h.orig 2013-09-28 19:29:53.000000000 +0200 +++ v8/src/platform-posix.h 2013-10-11 17:28:41.000000000 +0200 -@@ -29,6 +29,7 @@ - #define V8_PLATFORM_POSIX_H_ - - #if !defined(ANDROID) -+#include // size_t - #include - #endif - #include @@ -40,12 +41,12 @@ // Used by platform implementation files during OS::DumpBacktrace() Added: head/www/chromium/files/patch-v8__src__platform-posix.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-v8__src__platform-posix.h Sun Oct 13 22:18:04 2013 (r330261) @@ -0,0 +1,10 @@ +--- v8/src/platform-posix.h.orig 2013-10-05 16:38:26.000000000 +0200 ++++ v8/src/platform-posix.h 2013-10-13 19:06:41.000000000 +0200 +@@ -28,6 +28,7 @@ + #ifndef V8_PLATFORM_POSIX_H_ + #define V8_PLATFORM_POSIX_H_ + ++#include // size_t + #if !defined(ANDROID) + #include + #endif