1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: upgrade libuv to 8e3e60f

Browse Source
This commit is contained in:
Ben Noordhuis 2013-01-13 01:29:34 +01:00
parent bac537b186
commit e4f2a140d2
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deps/uv/gyp_uv vendored
View File

@ -1,6 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
import glob import glob
import platform
import os import os
import subprocess import subprocess
import sys import sys
@ -18,6 +19,14 @@ except ImportError:
sys.exit(42) sys.exit(42)
def host_arch():
machine = platform.machine()
if machine == 'i386': return 'ia32'
if machine == 'x86_64': return 'x64'
if machine.startswith('arm'): return 'arm'
return machine # Return as-is and hope for the best.
def compiler_version(): def compiler_version():
proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE) proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE)
is_clang = 'clang' in proc.communicate()[0].split('\n')[0] is_clang = 'clang' in proc.communicate()[0].split('\n')[0]
@ -72,8 +81,11 @@ if __name__ == '__main__':
args.append('-Dgcc_version=%d' % (10 * major + minor)) args.append('-Dgcc_version=%d' % (10 * major + minor))
args.append('-Dclang=%d' % int(is_clang)) args.append('-Dclang=%d' % int(is_clang))
if not any(a.startswith('-Dhost_arch=') for a in args):
args.append('-Dhost_arch=%s' % host_arch())
if not any(a.startswith('-Dtarget_arch=') for a in args): if not any(a.startswith('-Dtarget_arch=') for a in args):
args.append('-Dtarget_arch=ia32') args.append('-Dtarget_arch=%s' % host_arch())
if not any(a.startswith('-Dlibrary=') for a in args): if not any(a.startswith('-Dlibrary=') for a in args):
args.append('-Dlibrary=static_library') args.append('-Dlibrary=static_library')

7
deps/uv/src/unix/linux/syscalls.h vendored
View File

@ -69,10 +69,17 @@
#define UV__IN_DELETE_SELF 0x400 #define UV__IN_DELETE_SELF 0x400
#define UV__IN_MOVE_SELF 0x800 #define UV__IN_MOVE_SELF 0x800
#if defined(__x86_64__)
struct uv__epoll_event { struct uv__epoll_event {
__u32 events; __u32 events;
__u64 data; __u64 data;
} __attribute__((packed)); } __attribute__((packed));
#else
struct uv__epoll_event {
__u32 events;
__u64 data;
};
#endif
struct uv__inotify_event { struct uv__inotify_event {
__s32 wd; __s32 wd;