Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Commit

Permalink
deps: upgrade libuv to 8e3e60f
Browse files Browse the repository at this point in the history
  • Loading branch information
bnoordhuis committed Jan 13, 2013
1 parent bac537b commit e4f2a14
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
14 changes: 13 additions & 1 deletion deps/uv/gyp_uv
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env python

import glob
import platform
import os
import subprocess
import sys
Expand All @@ -18,6 +19,14 @@ except ImportError:
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():
proc = subprocess.Popen(CC.split() + ['--version'], stdout=subprocess.PIPE)
is_clang = 'clang' in proc.communicate()[0].split('\n')[0]
Expand Down Expand Up @@ -72,8 +81,11 @@ if __name__ == '__main__':
args.append('-Dgcc_version=%d' % (10 * major + minor))
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):
args.append('-Dtarget_arch=ia32')
args.append('-Dtarget_arch=%s' % host_arch())

if not any(a.startswith('-Dlibrary=') for a in args):
args.append('-Dlibrary=static_library')
Expand Down
7 changes: 7 additions & 0 deletions deps/uv/src/unix/linux/syscalls.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,17 @@
#define UV__IN_DELETE_SELF 0x400
#define UV__IN_MOVE_SELF 0x800

#if defined(__x86_64__)
struct uv__epoll_event {
__u32 events;
__u64 data;
} __attribute__((packed));
#else
struct uv__epoll_event {
__u32 events;
__u64 data;
};
#endif

struct uv__inotify_event {
__s32 wd;
Expand Down

0 comments on commit e4f2a14

Please sign in to comment.