Browse Source

Added support for cross compilation and also fixed DEST_CPU to represent the canonical symbols dictated by v8

v0.7.4-release
Rasmus Andersson 14 years ago
committed by Ryan Dahl
parent
commit
e5a0fbe500
  1. 14
      Makefile
  2. 0
      deps/c-ares/cygwin-ia32/ares_build.h
  3. 0
      deps/c-ares/cygwin-ia32/ares_config.h
  4. 0
      deps/c-ares/cygwin-ia32/ares_setup.h
  5. 0
      deps/c-ares/darwin-ia32/ares_build.h
  6. 0
      deps/c-ares/darwin-ia32/ares_config.h
  7. 0
      deps/c-ares/darwin-ia32/ares_setup.h
  8. 0
      deps/c-ares/darwin-x64/ares_build.h
  9. 0
      deps/c-ares/darwin-x64/ares_config.h
  10. 0
      deps/c-ares/darwin-x64/ares_setup.h
  11. 0
      deps/c-ares/freebsd-ia32/ares_build.h
  12. 0
      deps/c-ares/freebsd-ia32/ares_config.h
  13. 0
      deps/c-ares/freebsd-ia32/ares_setup.h
  14. 0
      deps/c-ares/freebsd-x64/ares_build.h
  15. 0
      deps/c-ares/freebsd-x64/ares_config.h
  16. 0
      deps/c-ares/freebsd-x64/ares_setup.h
  17. 0
      deps/c-ares/linux-ia32/ares_build.h
  18. 0
      deps/c-ares/linux-ia32/ares_config.h
  19. 0
      deps/c-ares/linux-ia32/ares_setup.h
  20. 0
      deps/c-ares/linux-x64/ares_build.h
  21. 0
      deps/c-ares/linux-x64/ares_config.h
  22. 0
      deps/c-ares/linux-x64/ares_setup.h
  23. 0
      deps/c-ares/openbsd-ia32/ares_build.h
  24. 0
      deps/c-ares/openbsd-ia32/ares_config.h
  25. 0
      deps/c-ares/openbsd-ia32/ares_setup.h
  26. 0
      deps/c-ares/openbsd-x64/ares_build.h
  27. 0
      deps/c-ares/openbsd-x64/ares_config.h
  28. 0
      deps/c-ares/openbsd-x64/ares_setup.h
  29. 0
      deps/c-ares/sunos-ia32/ares_build.h
  30. 0
      deps/c-ares/sunos-ia32/ares_config.h
  31. 0
      deps/c-ares/sunos-ia32/ares_setup.h
  32. 81
      wscript

14
Makefile

@ -1,11 +1,19 @@
WAF=python tools/waf-light WAF=python tools/waf-light
all: all: program
@$(WAF) build
all-progress: all-progress:
@$(WAF) -p build @$(WAF) -p build
program:
@$(WAF) --product-type=program build
staticlib:
@$(WAF) --product-type=cstaticlib build
dynamiclib:
@$(WAF) --product-type=cshlib build
install: install:
@$(WAF) install @$(WAF) install
@ -91,4 +99,4 @@ bench-idle:
./node benchmark/idle_clients.js & ./node benchmark/idle_clients.js &
.PHONY: bench clean docclean dist distclean check uninstall install all test test-all website-upload .PHONY: bench clean docclean dist distclean check uninstall install all program staticlib dynamiclib test test-all website-upload

0
deps/c-ares/cygwin-x86/ares_build.h → deps/c-ares/cygwin-ia32/ares_build.h

0
deps/c-ares/cygwin-x86/ares_config.h → deps/c-ares/cygwin-ia32/ares_config.h

0
deps/c-ares/cygwin-x86/ares_setup.h → deps/c-ares/cygwin-ia32/ares_setup.h

0
deps/c-ares/darwin-x86/ares_build.h → deps/c-ares/darwin-ia32/ares_build.h

0
deps/c-ares/darwin-x86/ares_config.h → deps/c-ares/darwin-ia32/ares_config.h

0
deps/c-ares/darwin-x86/ares_setup.h → deps/c-ares/darwin-ia32/ares_setup.h

0
deps/c-ares/darwin-x86_64/ares_build.h → deps/c-ares/darwin-x64/ares_build.h

0
deps/c-ares/darwin-x86_64/ares_config.h → deps/c-ares/darwin-x64/ares_config.h

0
deps/c-ares/darwin-x86_64/ares_setup.h → deps/c-ares/darwin-x64/ares_setup.h

0
deps/c-ares/freebsd-x86/ares_build.h → deps/c-ares/freebsd-ia32/ares_build.h

0
deps/c-ares/freebsd-x86/ares_config.h → deps/c-ares/freebsd-ia32/ares_config.h

0
deps/c-ares/freebsd-x86/ares_setup.h → deps/c-ares/freebsd-ia32/ares_setup.h

0
deps/c-ares/freebsd-x86_64/ares_build.h → deps/c-ares/freebsd-x64/ares_build.h

0
deps/c-ares/freebsd-x86_64/ares_config.h → deps/c-ares/freebsd-x64/ares_config.h

0
deps/c-ares/freebsd-x86_64/ares_setup.h → deps/c-ares/freebsd-x64/ares_setup.h

0
deps/c-ares/linux-x86/ares_build.h → deps/c-ares/linux-ia32/ares_build.h

0
deps/c-ares/linux-x86/ares_config.h → deps/c-ares/linux-ia32/ares_config.h

0
deps/c-ares/linux-x86/ares_setup.h → deps/c-ares/linux-ia32/ares_setup.h

0
deps/c-ares/linux-x86_64/ares_build.h → deps/c-ares/linux-x64/ares_build.h

0
deps/c-ares/linux-x86_64/ares_config.h → deps/c-ares/linux-x64/ares_config.h

0
deps/c-ares/linux-x86_64/ares_setup.h → deps/c-ares/linux-x64/ares_setup.h

0
deps/c-ares/openbsd-x86/ares_build.h → deps/c-ares/openbsd-ia32/ares_build.h

0
deps/c-ares/openbsd-x86/ares_config.h → deps/c-ares/openbsd-ia32/ares_config.h

0
deps/c-ares/openbsd-x86/ares_setup.h → deps/c-ares/openbsd-ia32/ares_setup.h

0
deps/c-ares/openbsd-x86_64/ares_build.h → deps/c-ares/openbsd-x64/ares_build.h

0
deps/c-ares/openbsd-x86_64/ares_config.h → deps/c-ares/openbsd-x64/ares_config.h

0
deps/c-ares/openbsd-x86_64/ares_setup.h → deps/c-ares/openbsd-x64/ares_setup.h

0
deps/c-ares/sunos-x86/ares_build.h → deps/c-ares/sunos-ia32/ares_build.h

0
deps/c-ares/sunos-x86/ares_config.h → deps/c-ares/sunos-ia32/ares_config.h

0
deps/c-ares/sunos-x86/ares_setup.h → deps/c-ares/sunos-ia32/ares_setup.h

81
wscript

@ -13,13 +13,21 @@ import js2c
srcdir = '.' srcdir = '.'
blddir = 'build' blddir = 'build'
supported_archs = ('arm', 'ia32', 'x64') # 'mips' supported by v8, but not node
jobs=1 jobs=1
if os.environ.has_key('JOBS'): if os.environ.has_key('JOBS'):
jobs = int(os.environ['JOBS']) jobs = int(os.environ['JOBS'])
def canonical_cpu_type(arch):
m = {'i386':'ia32', 'x86_64':'x64', 'amd64':'x64'}
if arch in m: arch = m[arch]
if not arch in supported_archs:
raise Exception("supported architectures are "+', '.join(supported_archs)+\
" but NOT '" + arch + "'.")
return arch
def set_options(opt): def set_options(opt):
# the gcc module provides a --debug-level option # the gcc module provides a --debug-level option
opt.tool_options('compiler_cxx') opt.tool_options('compiler_cxx')
@ -126,6 +134,23 @@ def set_options(opt):
) )
opt.add_option( '--product-type'
, action='store'
, default='program'
, help='What kind of product to produce (program, cstaticlib '\
'or cshlib) [default: %default]'
, dest='product_type'
)
opt.add_option( '--dest-cpu'
, action='store'
, default=None
, help='CPU architecture to build for. Valid values are: '+\
', '.join(supported_archs)
, dest='dest_cpu'
)
def configure(conf): def configure(conf):
@ -189,6 +214,14 @@ def configure(conf):
else: else:
Options.options.use_openssl = conf.env["USE_OPENSSL"] = False Options.options.use_openssl = conf.env["USE_OPENSSL"] = False
# normalize DEST_CPU from --dest-cpu, DEST_CPU or built-in value
if Options.options.dest_cpu and Options.options.dest_cpu:
conf.env['DEST_CPU'] = canonical_cpu_type(Options.options.dest_cpu)
elif 'DEST_CPU' in os.environ and os.environ['DEST_CPU']:
conf.env['DEST_CPU'] = canonical_cpu_type(os.environ['DEST_CPU'])
elif 'DEST_CPU' in conf.env and conf.env['DEST_CPU']:
conf.env['DEST_CPU'] = canonical_cpu_type(conf.env['DEST_CPU'])
conf.check(lib='rt', uselib_store='RT') conf.check(lib='rt', uselib_store='RT')
if sys.platform.startswith("sunos"): if sys.platform.startswith("sunos"):
@ -265,6 +298,27 @@ def configure(conf):
if sys.platform.startswith("darwin"): if sys.platform.startswith("darwin"):
# used by platform_darwin_*.cc # used by platform_darwin_*.cc
conf.env.append_value('LINKFLAGS', ['-framework','Carbon']) conf.env.append_value('LINKFLAGS', ['-framework','Carbon'])
# cross compile for architecture specified by DEST_CPU
if 'DEST_CPU' in conf.env:
arch = conf.env['DEST_CPU']
# map supported_archs to GCC names:
arch_mappings = {'ia32': 'i386', 'x64': 'x86_64'}
if arch in arch_mappings:
arch = arch_mappings[arch]
flags = ['-arch', arch]
conf.env.append_value('CCFLAGS', flags)
conf.env.append_value('CXXFLAGS', flags)
conf.env.append_value('LINKFLAGS', flags)
if 'DEST_CPU' in conf.env:
arch = conf.env['DEST_CPU']
# TODO: -m32 is only available on 64 bit machines, so check host type
flags = None
if arch == 'ia32':
flags = '-m32'
if flags:
conf.env.append_value('CCFLAGS', flags)
conf.env.append_value('CXXFLAGS', flags)
conf.env.append_value('LINKFLAGS', flags)
# Needed for getaddrinfo in libeio # Needed for getaddrinfo in libeio
conf.env.append_value("CPPFLAGS", "-DX_STACKSIZE=%d" % (1024*64)) conf.env.append_value("CPPFLAGS", "-DX_STACKSIZE=%d" % (1024*64))
@ -325,15 +379,10 @@ def v8_cmd(bld, variant):
# executable is statically linked together... # executable is statically linked together...
# XXX Change this when v8 defaults x86_64 to native builds # XXX Change this when v8 defaults x86_64 to native builds
# Possible values are (arm, ia32, x64, mips).
arch = "" arch = ""
if bld.env['DEST_CPU'] == 'x86': if bld.env['DEST_CPU']:
arch = "" arch = "arch="+bld.env['DEST_CPU']
elif bld.env['DEST_CPU'] == 'x86_64':
arch = "arch=x64"
elif bld.env['DEST_CPU'] == 'arm':
arch = "arch=arm"
else:
raise Exception("supported architectures are 'x86', 'x86_64', and 'arm', but NOT '" + bld.env['DEST_CPU'] + "'.")
if variant == "default": if variant == "default":
mode = "release" mode = "release"
@ -397,10 +446,13 @@ def build(bld):
Build.BuildContext.exec_command = exec_command Build.BuildContext.exec_command = exec_command
Options.options.jobs=jobs Options.options.jobs=jobs
product_type = Options.options.product_type
product_type_is_lib = product_type != 'program'
print "DEST_OS: " + bld.env['DEST_OS'] print "DEST_OS: " + bld.env['DEST_OS']
print "DEST_CPU: " + bld.env['DEST_CPU'] print "DEST_CPU: " + bld.env['DEST_CPU']
print "Parallel Jobs: " + str(Options.options.jobs) print "Parallel Jobs: " + str(Options.options.jobs)
print "Product type: " + product_type
bld.add_subdirs('deps/libeio') bld.add_subdirs('deps/libeio')
@ -471,16 +523,17 @@ def build(bld):
native_cc.rule = javascript_in_c native_cc.rule = javascript_in_c
### node lib ### node lib
node = bld.new_task_gen("cxx", "program") node = bld.new_task_gen("cxx", product_type)
node.name = "node" node.name = "node"
node.target = "node" node.target = "node"
node.uselib = 'RT EV OPENSSL CARES EXECINFO DL KVM SOCKET NSL' node.uselib = 'RT EV OPENSSL CARES EXECINFO DL KVM SOCKET NSL'
node.add_objects = 'eio http_parser' node.add_objects = 'eio http_parser'
node.install_path = '${PREFIX}/lib' if product_type_is_lib:
node.install_path = '${PREFIX}/bin' node.install_path = '${PREFIX}/lib'
else:
node.install_path = '${PREFIX}/bin'
node.chmod = 0755 node.chmod = 0755
node.source = """ node.source = """
src/node_main.cc
src/node.cc src/node.cc
src/node_buffer.cc src/node_buffer.cc
src/node_javascript.cc src/node_javascript.cc
@ -499,6 +552,8 @@ def build(bld):
src/node_timer.cc src/node_timer.cc
src/node_script.cc src/node_script.cc
""" """
if not product_type_is_lib:
node.source = 'src/node_main.cc '+node.source
platform_file = "src/platform_%s.cc" % bld.env['DEST_OS'] platform_file = "src/platform_%s.cc" % bld.env['DEST_OS']
if os.path.exists(join(cwd, platform_file)): if os.path.exists(join(cwd, platform_file)):

Loading…
Cancel
Save