From owner-svn-ports-all@FreeBSD.ORG Sat Feb 21 00:19:46 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 012ED27C; Sat, 21 Feb 2015 00:19:45 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6521FD; Sat, 21 Feb 2015 00:19:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1L0JjVO080172; Sat, 21 Feb 2015 00:19:45 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1L0Jj25080170; Sat, 21 Feb 2015 00:19:45 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201502210019.t1L0Jj25080170@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sat, 21 Feb 2015 00:19:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379474 - in branches/2015Q1/www/chromium: . files X-SVN-Group: ports-branches 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.18-1 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: Sat, 21 Feb 2015 00:19:46 -0000 Author: rene Date: Sat Feb 21 00:19:44 2015 New Revision: 379474 URL: https://svnweb.freebsd.org/changeset/ports/379474 QAT: https://qat.redports.org/buildarchive/r379474/ Log: MFH: r379470 www/chromium: fixup last commit - Make __FreeBSD_versoin check actually work - Implement OS::GetCurrnetThreadId on FreeBSD 8 - Move DragonFly's condtional to its own #elif for clarity - Add NetBSD conditional for reference Differential Revision: https://reviews.freebsd.org/D1857 Submitted by: jbeich Reviewed by: marino, myself Approved by: ports-secteam (zi) Modified: branches/2015Q1/www/chromium/Makefile branches/2015Q1/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/chromium/Makefile ============================================================================== --- branches/2015Q1/www/chromium/Makefile Fri Feb 20 23:51:55 2015 (r379473) +++ branches/2015Q1/www/chromium/Makefile Sat Feb 21 00:19:44 2015 (r379474) @@ -3,6 +3,7 @@ PORTNAME= chromium PORTVERSION= 40.0.2214.111 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Modified: branches/2015Q1/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc ============================================================================== --- branches/2015Q1/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc Fri Feb 20 23:51:55 2015 (r379473) +++ branches/2015Q1/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc Sat Feb 21 00:19:44 2015 (r379474) @@ -1,17 +1,37 @@ --- v8/src/base/platform/platform-posix.cc.orig 2015-01-27 03:22:59.000000000 +0100 +++ v8/src/base/platform/platform-posix.cc 2015-02-06 18:41:53.881294389 +0100 -@@ -259,6 +259,14 @@ +@@ -54,6 +54,15 @@ + #include // NOLINT, for prctl + #endif + ++#if V8_OS_FREEBSD && !defined(__DragonFly__) ++#include // for __FreeBSD_version ++#include // for thr_self ++#endif ++ ++#if V8_OS_NETBSD ++#include // for _lwp_self ++#endif ++ + #if !V8_OS_NACL + #include + #endif +@@ -259,6 +268,18 @@ int OS::GetCurrentThreadId() { return static_cast(syscall(__NR_gettid)); #elif V8_OS_ANDROID return static_cast(gettid()); -+#elif V8_OS_FREEBSD -+# ifdef __DragonFly__ ++#elif V8_OS_DRAGONFLYBSD || defined(__DragonFly__) + return static_cast(lwp_gettid()); -+# elif __FreeBSD_version__ < 900031 -+ return 0; /* ! */ ++#elif V8_OS_FREEBSD ++# if __FreeBSD_version < 900031 ++ long lwpid; ++ thr_self(&lwpid); ++ return static_cast(lwpid); +# else + return static_cast(pthread_getthreadid_np()); +# endif ++#elif V8_OS_NETBSD ++ return static_cast(_lwp_self()); #else return static_cast(pthread_self()); #endif