diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2015-02-21 00:19:44 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2015-02-21 00:19:44 +0000 |
| commit | ecc6acc153e8594a80b004af6e0c266670a51d45 (patch) | |
| tree | a220faca7452c0e3040b083523c1248d0beae137 | |
| parent | 610fccd3a154fbb46aa092de3d79bd350aa97eb1 (diff) | |
| download | ports-ecc6acc153e8594a80b004af6e0c266670a51d45.tar.gz ports-ecc6acc153e8594a80b004af6e0c266670a51d45.zip | |
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)
Notes
Notes:
svn path=/branches/2015Q1/; revision=379474
| -rw-r--r-- | www/chromium/Makefile | 1 | ||||
| -rw-r--r-- | www/chromium/files/patch-v8__src__base__platform__platform-posix.cc | 30 |
2 files changed, 26 insertions, 5 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index fd1d56733232..f1604221c455 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -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} diff --git a/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc b/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc index f95959d1b574..215e4edcbd20 100644 --- a/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc +++ b/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc @@ -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 <sys/prctl.h> // NOLINT, for prctl + #endif + ++#if V8_OS_FREEBSD && !defined(__DragonFly__) ++#include <sys/param.h> // for __FreeBSD_version ++#include <sys/thr.h> // for thr_self ++#endif ++ ++#if V8_OS_NETBSD ++#include <lwp.h> // for _lwp_self ++#endif ++ + #if !V8_OS_NACL + #include <sys/syscall.h> + #endif +@@ -259,6 +268,18 @@ int OS::GetCurrentThreadId() { return static_cast<int>(syscall(__NR_gettid)); #elif V8_OS_ANDROID return static_cast<int>(gettid()); -+#elif V8_OS_FREEBSD -+# ifdef __DragonFly__ ++#elif V8_OS_DRAGONFLYBSD || defined(__DragonFly__) + return static_cast<int>(lwp_gettid()); -+# elif __FreeBSD_version__ < 900031 -+ return 0; /* ! */ ++#elif V8_OS_FREEBSD ++# if __FreeBSD_version < 900031 ++ long lwpid; ++ thr_self(&lwpid); ++ return static_cast<int>(lwpid); +# else + return static_cast<int>(pthread_getthreadid_np()); +# endif ++#elif V8_OS_NETBSD ++ return static_cast<int>(_lwp_self()); #else return static_cast<int>(pthread_self()); #endif |