Skip to content

Commit

Permalink
OS-2676 update platform to node 0.10
Browse files Browse the repository at this point in the history
OS-2891 fs.watch is broken on node 0.10.26 preventing upgrade
  • Loading branch information
Keith M Wesolowski committed Apr 9, 2014
1 parent f7db4a9 commit 65cd149
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 90 deletions.
30 changes: 15 additions & 15 deletions manifest
Expand Up @@ -313,22 +313,22 @@ f usr/gnu/share/terminfo/x/xterms 0644 root bin
f usr/gnu/share/terminfo/x/xterms-sun 0644 root bin
# node.js
d usr/node 0755 root bin
d usr/node/0.8 0755 root bin
d usr/node/0.8/bin 0755 root bin
d usr/node/0.8/lib 0755 root bin
d usr/node/0.8/lib/dtrace 0755 root bin
d usr/node/0.8/man 0755 root bin
d usr/node/0.8/man/man1 0755 root bin
d usr/node/0.8/node_modules 0755 root bin
d usr/node/0.10 0755 root bin
d usr/node/0.10/bin 0755 root bin
d usr/node/0.10/lib 0755 root bin
d usr/node/0.10/lib/dtrace 0755 root bin
d usr/node/0.10/man 0755 root bin
d usr/node/0.10/man/man1 0755 root bin
d usr/node/0.10/node_modules 0755 root bin
d usr/node/bin 0755 root bin
s usr/node/bin/node=../0.8/bin/node
s usr/node/node_modules=./0.8/node_modules
f usr/node/0.8/bin/node 0555 root bin
f usr/node/0.8/man/man1/node.1 0444 root bin
f usr/node/0.8/lib/dtrace/node.d 0444 root bin
f usr/node/0.8/node_modules/platform_node_version.js 0444 root bin
s usr/share/man/man1/node.1=../../../node/0.8/man/man1/node.1
h usr/lib/dtrace/node.d=usr/node/0.8/lib/dtrace/node.d
s usr/node/bin/node=../0.10/bin/node
s usr/node/node_modules=./0.10/node_modules
f usr/node/0.10/bin/node 0555 root bin
f usr/node/0.10/man/man1/node.1 0444 root bin
f usr/node/0.10/lib/dtrace/node.d 0444 root bin
f usr/node/0.10/node_modules/platform_node_version.js 0444 root bin
s usr/share/man/man1/node.1=../../../node/0.10/man/man1/node.1
h usr/lib/dtrace/node.d=usr/node/0.10/lib/dtrace/node.d
# nss-nspr
d usr/lib/mps 0755 root bin
s usr/lib/mps/64=amd64
Expand Down
4 changes: 2 additions & 2 deletions node.js/Makefile
Expand Up @@ -21,8 +21,8 @@
# Copyright (c) 2013, Joyent, Inc. All rights reserved.
#

MAJOR_VER = 0.8
VER = node-v0.8.26
MAJOR_VER = 0.10
VER = node-v0.10.26

include ../Makefile.defs

Expand Down
61 changes: 0 additions & 61 deletions node.js/Patches/abort_on_uncaught_exception.patch

This file was deleted.

16 changes: 16 additions & 0 deletions node.js/Patches/fs-event.diff
@@ -0,0 +1,16 @@
diff --git a/deps/uv/src/unix/sunos.c b/deps/uv/src/unix/sunos.c
index 9030bfa..5249de0 100644
--- a/deps/uv/src/unix/sunos.c
+++ b/deps/uv/src/unix/sunos.c
@@ -364,11 +364,11 @@ static void uv__fs_event_read(uv_loop_t* loop,
handle->fd = PORT_FIRED;
handle->cb(handle, NULL, events, 0);

- if (handle->fd != PORT_DELETED)
+ if (handle->fd != PORT_DELETED && !(events & UV_RENAME))
if (uv__fs_event_rearm(handle) != 0)
handle->cb(handle, NULL, 0, -1);
}
- while (handle->fd != PORT_DELETED);
+ while (handle->fd != PORT_DELETED && !(events & UV_RENAME));
}
2 changes: 1 addition & 1 deletion node.js/Patches/node-5feedc5-socket-getFD.patch
Expand Up @@ -37,7 +37,7 @@ index e79d212..c7c0489 100644
+
+ UNWRAP(StreamWrap)
+
+ int fd = (int)wrap->stream_->fd;
+ int fd = (int)wrap->stream_->io_watcher.fd;
+
+ return scope.Close(Integer::New(fd));
+}
Expand Down
22 changes: 11 additions & 11 deletions node.js/Patches/separate-host.diff
@@ -1,15 +1,14 @@
diff -ur node-v0.8.14/configure node-v0.8.14-32/configure
--- node-v0.8.14/configure 2012-10-25 20:49:32.000000000 +0000
+++ node-v0.8.14-32/configure 2013-01-11 20:31:32.754470909 +0000
@@ -359,6 +359,7 @@
--- a/configure.orig Wed Dec 18 23:49:45 2013
+++ b/configure Mon Dec 23 21:03:16 2013
@@ -470,6 +470,7 @@
target_arch = options.dest_cpu or host_arch
o['variables']['host_arch'] = host_arch
o['variables']['target_arch'] = target_arch
+ o['variables']['want_separate_host_toolset'] = '1'

if target_arch == 'arm':
configure_arm(o)
@@ -400,13 +401,13 @@
@@ -533,13 +534,13 @@

# assume shared_zlib if one of these is set?
if options.shared_zlib_libpath:
Expand All @@ -24,8 +23,8 @@ diff -ur node-v0.8.14/configure node-v0.8.14-32/configure
+ o['include_dirs_target'] += [options.shared_zlib_includes]


def configure_v8(o):
@@ -415,13 +416,13 @@
def configure_http_parser(o):
@@ -590,13 +591,13 @@

# assume shared_v8 if one of these is set?
if options.shared_v8_libpath:
Expand All @@ -41,7 +40,7 @@ diff -ur node-v0.8.14/configure node-v0.8.14-32/configure


def configure_openssl(o):
@@ -438,7 +439,7 @@
@@ -613,7 +614,7 @@
(libs, cflags) = pkg_config('openssl') or ('-lssl -lcrypto', '')

if options.shared_openssl_libpath:
Expand All @@ -50,7 +49,7 @@ diff -ur node-v0.8.14/configure node-v0.8.14-32/configure

if options.shared_openssl_libname:
libnames = options.shared_openssl_libname.split(',')
@@ -447,17 +448,18 @@
@@ -622,7 +623,7 @@
o['libraries'] += libs.split()

if options.shared_openssl_includes:
Expand All @@ -59,15 +58,16 @@ diff -ur node-v0.8.14/configure node-v0.8.14-32/configure
else:
o['cflags'] += cflags.split()

@@ -650,10 +651,11 @@

output = {
'variables': {},
'variables': { 'python': sys.executable },
- 'include_dirs': [],
+ 'include_dirs_target': [],
'libraries': [],
'defines': [],
'cflags': [],
+ 'ldflags_target': [],
+ 'ldflags_target': []
}

configure_node(output)
Binary file not shown.

0 comments on commit 65cd149

Please sign in to comment.